[Bf-blender-cvs] [a93f6a5429d] blender-v3.3-release: LibOverride: Tweaks to new menus in Outliner.
Bastien Montagne
noreply at git.blender.org
Tue Aug 16 14:21:19 CEST 2022
Commit: a93f6a5429d6c6ff1765d06a3a8fd4817bd95e67
Author: Bastien Montagne
Date: Tue Aug 16 14:12:46 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rBa93f6a5429d6c6ff1765d06a3a8fd4817bd95e67
LibOverride: Tweaks to new menus in Outliner.
Also add new outliner liboverride operators mapping to the manual,
though this is useless currently as this feature is not working in many
part of the UI, including the Outliner contextual menu.
===================================================================
M release/scripts/modules/rna_manual_reference.py
M release/scripts/startup/bl_ui/space_outliner.py
M source/blender/editors/space_outliner/outliner_tools.cc
===================================================================
diff --git a/release/scripts/modules/rna_manual_reference.py b/release/scripts/modules/rna_manual_reference.py
index b40a575d1c1..bd22b95a996 100644
--- a/release/scripts/modules/rna_manual_reference.py
+++ b/release/scripts/modules/rna_manual_reference.py
@@ -165,6 +165,7 @@ url_manual_mapping = (
("bpy.types.sequencertimelineoverlay.show_strip_source*", "editors/video_sequencer/sequencer/display.html#bpy-types-sequencertimelineoverlay-show-strip-source"),
("bpy.types.toolsettings.use_gpencil_automerge_strokes*", "grease_pencil/modes/draw/introduction.html#bpy-types-toolsettings-use-gpencil-automerge-strokes"),
("bpy.types.toolsettings.use_proportional_edit_objects*", "editors/3dview/controls/proportional_editing.html#bpy-types-toolsettings-use-proportional-edit-objects"),
+ ("bpy.ops.outliner.liboverride_troubleshoot_operation*", "files/linked_libraries/library_overrides.html#resync-library-override-hierarchy"),
("bpy.ops.view3d.edit_mesh_extrude_move_shrink_fatten*", "modeling/meshes/editing/face/extrude_faces_normal.html#bpy-ops-view3d-edit-mesh-extrude-move-shrink-fatten"),
("bpy.types.brushgpencilsettings.active_smooth_factor*", "grease_pencil/modes/draw/tools/draw.html#bpy-types-brushgpencilsettings-active-smooth-factor"),
("bpy.types.brushgpencilsettings.extend_stroke_factor*", "grease_pencil/modes/draw/tools/fill.html#bpy-types-brushgpencilsettings-extend-stroke-factor"),
@@ -908,6 +909,7 @@ url_manual_mapping = (
("bpy.types.view3doverlay.show_wireframes*", "editors/3dview/display/overlays.html#bpy-types-view3doverlay-show-wireframes"),
("bpy.types.view3dshading.background_type*", "editors/3dview/display/shading.html#bpy-types-view3dshading-background-type"),
("bpy.types.workspace.use_filter_by_owner*", "interface/window_system/workspaces.html#bpy-types-workspace-use-filter-by-owner"),
+ ("bpy.ops.outliner.liboverride_operation*", "files/linked_libraries/library_overrides.html#library-overrides"),
("bpy.ops.gpencil.image_to_grease_pencil*", "editors/image/editing.html#bpy-ops-gpencil-image-to-grease-pencil"),
("bpy.ops.mesh.vertices_smooth_laplacian*", "modeling/meshes/editing/vertex/laplacian_smooth.html#bpy-ops-mesh-vertices-smooth-laplacian"),
("bpy.ops.object.multires_rebuild_subdiv*", "modeling/modifiers/generate/multiresolution.html#bpy-ops-object-multires-rebuild-subdiv"),
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 5759770987d..4867237f353 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -331,7 +331,7 @@ class OUTLINER_MT_liboverride(Menu):
layout = self.layout
layout.operator_menu_enum("outliner.liboverride_operation", "selection_set",
- text="Create").type = 'OVERRIDE_LIBRARY_CREATE_HIERARCHY'
+ text="Make").type = 'OVERRIDE_LIBRARY_CREATE_HIERARCHY'
layout.operator_menu_enum(
"outliner.liboverride_operation",
"selection_set",
@@ -339,8 +339,10 @@ class OUTLINER_MT_liboverride(Menu):
layout.operator_menu_enum("outliner.liboverride_operation", "selection_set",
text="Clear").type = 'OVERRIDE_LIBRARY_CLEAR_SINGLE'
+ layout.separator()
+
layout.operator_menu_enum("outliner.liboverride_troubleshoot_operation", "type",
- text="Troubleshoot Hierarchy").selection_set = 'SELECTED'
+ text="Troubleshoot").selection_set = 'SELECTED'
class OUTLINER_PT_filter(Panel):
diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc
index ec80eacf6ab..61b2b6c0002 100644
--- a/source/blender/editors/space_outliner/outliner_tools.cc
+++ b/source/blender/editors/space_outliner/outliner_tools.cc
@@ -1634,8 +1634,8 @@ static const EnumPropertyItem prop_liboverride_op_types[] = {
{OUTLINER_LIBOVERRIDE_OP_CREATE_HIERARCHY,
"OVERRIDE_LIBRARY_CREATE_HIERARCHY",
0,
- "Create",
- "Make a local override of the selected linked data-blocks, and their hierarchy of "
+ "Make",
+ "Create a local override of the selected linked data-blocks, and their hierarchy of "
"dependencies"},
{OUTLINER_LIBOVERRIDE_OP_RESET,
"OVERRIDE_LIBRARY_RESET",
@@ -1665,6 +1665,7 @@ static const EnumPropertyItem prop_liboverride_troubleshoot_op_types[] = {
"Rebuild the selected local overrides from their linked references, as well as their "
"hierarchies of dependencies, enforcing these hierarchies to match the linked data (i.e. "
"ignoring existing overrides on data-blocks pointer properties)"},
+ RNA_ENUM_ITEM_SEPR,
{OUTLINER_LIBOVERRIDE_OP_DELETE_HIERARCHY,
"OVERRIDE_LIBRARY_DELETE_HIERARCHY",
0,
@@ -1812,6 +1813,7 @@ void OUTLINER_OT_liboverride_operation(wmOperatorType *ot)
/* identifiers */
ot->name = "Outliner Library Override Operation";
ot->idname = "OUTLINER_OT_liboverride_operation";
+ ot->description = "Create, reset or clear library override hierarchies";
/* callbacks */
ot->invoke = WM_menu_invoke;
@@ -1834,6 +1836,7 @@ void OUTLINER_OT_liboverride_troubleshoot_operation(wmOperatorType *ot)
/* identifiers */
ot->name = "Outliner Library Override Troubleshoot Operation";
ot->idname = "OUTLINER_OT_liboverride_troubleshoot_operation";
+ ot->description = "Advanced operations over library override to help fix broken hierarchies";
/* callbacks */
ot->invoke = WM_menu_invoke;
@@ -1842,18 +1845,18 @@ void OUTLINER_OT_liboverride_troubleshoot_operation(wmOperatorType *ot)
ot->flag = 0;
- RNA_def_enum(ot->srna,
- "type",
- prop_liboverride_troubleshoot_op_types,
- 0,
- "Library Override Troubleshoot Operation",
- "");
ot->prop = RNA_def_enum(ot->srna,
- "selection_set",
- prop_lib_op_selection_set,
+ "type",
+ prop_liboverride_troubleshoot_op_types,
0,
- "Selection Set",
- "Over which part of the tree items to apply the operation");
+ "Library Override Troubleshoot Operation",
+ "");
+ RNA_def_enum(ot->srna,
+ "selection_set",
+ prop_lib_op_selection_set,
+ 0,
+ "Selection Set",
+ "Over which part of the tree items to apply the operation");
}
/** \} */
@@ -2734,6 +2737,7 @@ void OUTLINER_OT_id_operation(wmOperatorType *ot)
/* identifiers */
ot->name = "Outliner ID Data Operation";
ot->idname = "OUTLINER_OT_id_operation";
+ ot->description = "General data-block management operations";
/* callbacks */
ot->invoke = WM_menu_invoke;
More information about the Bf-blender-cvs
mailing list