Merge branch 'blender-v4.2-release'

2024-06-21 10:53:08 +10:00
parent b4213141c2 72ef03d5a1
commit 8b9cf02ce9
6 changed files with 783 additions and 442 deletions
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -1141,7 +1141,7 @@ typedef enum eUserPref_Section {
  USER_SECTION_SYSTEM = 3,
  USER_SECTION_THEME = 4,
  USER_SECTION_INPUT = 5,
-  USER_SECTION_EXTENSIONS = 6,
+  USER_SECTION_ADDONS = 6,
  USER_SECTION_LIGHT = 7,
  USER_SECTION_KEYMAP = 8,
 #ifdef WITH_USERDEF_WORKSPACES
@@ -1154,6 +1154,7 @@ typedef enum eUserPref_Section {
  USER_SECTION_NAVIGATION = 14,
  USER_SECTION_FILE_PATHS = 15,
  USER_SECTION_EXPERIMENTAL = 16,
+  USER_SECTION_EXTENSIONS = 17,
 } eUserPref_Section;

 /** #UserDef_SpaceData.flag (State of the user preferences UI). */
--- a/source/blender/makesrna/intern/rna_userdef.cc
+++ b/source/blender/makesrna/intern/rna_userdef.cc
@@ -60,6 +60,7 @@ const EnumPropertyItem rna_enum_preference_section_items[] = {
    {USER_SECTION_ANIMATION, "ANIMATION", 0, "Animation", ""},
    RNA_ENUM_ITEM_SEPR,
    {USER_SECTION_EXTENSIONS, "EXTENSIONS", 0, "Extensions", ""},
+    {USER_SECTION_ADDONS, "ADDONS", 0, "Add-ons", ""},
    {USER_SECTION_THEME, "THEMES", 0, "Themes", ""},
 #if 0 /* def WITH_USERDEF_WORKSPACES */
    RNA_ENUM_ITEM_SEPR,