diff options
author | Bastien Montagne <bastien@blender.org> | 2022-08-16 15:21:33 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-08-16 15:21:33 +0300 |
commit | 90c14b1e44fc9342067e4219c5026b7f24685498 (patch) | |
tree | bc329211adeaf4d3e89701c1af3c559083b2f341 /release | |
parent | 1221a4049ccbb34bc7b43e85b09c366ca7e2dd35 (diff) | |
parent | a93f6a5429d6c6ff1765d06a3a8fd4817bd95e67 (diff) |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/modules/rna_manual_reference.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_outliner.py | 6 |
2 files changed, 6 insertions, 2 deletions
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): |