Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-06-18 21:40:41 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-18 21:43:26 +0300
commit0d8b92267d804e4ad8199e77c8a19a6d90d49dac (patch)
treeb02b2e6b52c1b61efc5030bb3d5674fadbfeffff /release
parent9fb59244466aa07c9addaf17bdb65192682bde87 (diff)
Object Mode: make mode locking optional
Design from T55246 is kept while allowing 2.7x behavior.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index fe1d23b4225..e5305bd96ef 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -46,7 +46,9 @@ 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]
- layout.operator_menu_enum("object.mode_set", "mode", text=act_mode_item.name, icon=act_mode_item.icon)
+ 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="")
del act_mode_item
layout.template_header_3D_mode()