Commit: 2d2db18f0bd5c070afb4346e813d5e1d41c54cf0
Author: Campbell Barton
Date: Tue Jun 19 09:11:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2d2db18f0bd5c070afb4346e813d5e1d41c54cf0
UI: move object-mode lock out of the 3D header
Avoid obscure options here.
Move to the edit menu, although this may be temporary.
===================================================================
M release/scripts/startup/bl_ui/space_topbar.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_topbar.py
b/release/scripts/startup/bl_ui/space_topbar.py
index a88e8164436..5ea5923c1e0 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -499,6 +499,12 @@ class INFO_MT_edit(Menu):
layout.separator()
+ # Should move elsewhere (impacts outliner & 3D view).
+ tool_settings = context.tool_settings
+ layout.prop(tool_settings, "lock_object_mode")
+
+ layout.separator()
+
layout.operator("screen.userpref_show", text="User Preferences...",
icon='PREFERENCES')
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index e5305bd96ef..9d83169f481 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -46,9 +46,7 @@ class VIEW3D_HT_header(Header):
mode = 'OBJECT' if obj is None else obj.mode
act_mode_item =
bpy.types.Object.bl_rna.properties["mode"].enum_items[mode]
- row = layout.row(align=True)
- row.operator_menu_enum("object.mode_set", "mode",
text=act_mode_item.name, icon=act_mode_item.icon)
- row.prop(tool_settings, "lock_object_mode", text="")
+ layout.operator_menu_enum("object.mode_set", "mode",
text=act_mode_item.name, icon=act_mode_item.icon)
del act_mode_item
layout.template_header_3D_mode()
@@ -801,6 +799,8 @@ class VIEW3D_MT_select_pose(Menu):
layout.operator_menu_enum("pose.select_grouped", "type",
text="Grouped")
layout.operator("object.select_pattern", text="Select Pattern...")
+ layout.operator("object.select_pattern", text="Select Pattern...")
+
class VIEW3D_MT_select_particle(Menu):
bl_label = "Select"
diff --git a/source/blender/makesrna/intern/rna_scene.c
b/source/blender/makesrna/intern/rna_scene.c
index 7932a316b0a..84b4e882b66 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2531,8 +2531,7 @@ static void rna_def_tool_settings(BlenderRNA *brna)
prop = RNA_def_property(srna, "lock_object_mode", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "object_flag",
SCE_OBJECT_MODE_LOCK);
- RNA_def_property_ui_text(prop, "Lock Object Mode", "");
- RNA_def_property_ui_icon(prop, ICON_LOCKVIEW_OFF, 1);
+ RNA_def_property_ui_text(prop, "Lock Object Modes", "Restrict select to
the current mode");
RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL);
/* Transform */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
