griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-06-08 13:46:38 +10:00
parent 3f247d6a3c 4718d68349
commit c0c1f1884a
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/addons_core/bl_pkg/bl_extension_ui.py
View File

@@ -987,7 +987,7 @@ class USERPREF_MT_extensions_settings(Menu):
layout.operator("extensions.package_upgrade_all", text="Install Available Updates", icon='IMPORT')
layout.operator("extensions.package_install_files", text="Install from Disk...")
if prefs.experimental.use_extension_utils:
if prefs.experimental.use_extensions_debug:
layout.separator()
layout.prop(addon_prefs, "show_development_reports")
@@ -1019,7 +1019,7 @@ def extensions_panel_draw(panel, context):
addon_prefs = prefs.addons[__package__].preferences
show_development = prefs.experimental.use_extension_utils
show_development = prefs.experimental.use_extensions_debug
show_development_reports = show_development and addon_prefs.show_development_reports
wm = context.window_manager

2
scripts/startup/bl_ui/space_userpref.py
View File

@@ -2791,7 +2791,6 @@ class USERPREF_PT_experimental_prototypes(ExperimentalPanel, Panel):
({"property": "use_grease_pencil_version3"}, ("blender/blender/projects/6", "Grease Pencil 3.0")),
({"property": "use_grease_pencil_version3_convert_on_load"}, ("blender/blender/projects/6", "Grease Pencil 3.0")),
({"property": "enable_overlay_next"}, ("blender/blender/issues/102179", "#102179")),
({"property": "use_extension_utils"}, ("/blender/blender/issues/117286", "#117286")),
({"property": "use_animation_baklava"}, ("/blender/blender/issues/120406", "#120406")),
),
)
@@ -2831,6 +2830,7 @@ class USERPREF_PT_experimental_debugging(ExperimentalPanel, Panel):
({"property": "use_asset_indexing"}, None),
({"property": "use_viewport_debug"}, None),
({"property": "use_eevee_debug"}, None),
({"property": "use_extensions_debug"}, ("/blender/blender/issues/119521", "#119521")),
),
)

2
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -740,6 +740,7 @@ typedef struct UserDef_Experimental {
char no_asset_indexing;
char use_viewport_debug;
char use_all_linked_data_direct;
char use_extensions_debug;
char SANITIZE_AFTER_HERE;
/* The following options are automatically sanitized (set to 0)
* when the release cycle is not alpha. */
@@ -752,7 +753,6 @@ typedef struct UserDef_Experimental {
char enable_overlay_next;
char use_new_volume_nodes;
char use_shader_node_previews;
char use_extension_utils;
char use_grease_pencil_version3_convert_on_load;
char use_animation_baklava;
char _pad[3];

6
source/blender/makesrna/intern/rna_userdef.cc
View File

@@ -7406,9 +7406,11 @@ static void rna_def_userdef_experimental(BlenderRNA *brna)
prop, "Shader Node Previews", "Enables previews in the shader node editor");
RNA_def_property_update(prop, 0, "rna_userdef_ui_update");
prop = RNA_def_property(srna, "use_extension_utils", PROP_BOOLEAN, PROP_NONE);
prop = RNA_def_property(srna, "use_extensions_debug", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_ui_text(
prop, "Extensions Development Utilities", "Developer support utilities for extensions");
prop,
"Extensions Debug",
"Extra debugging information & developer support utilities for extensions");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "use_animation_baklava", PROP_BOOLEAN, PROP_NONE);