diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-05 19:20:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-05 19:21:14 +0300 |
| commit | 1c24c04e6023f2d2a328dfcdc9f86cd381d029a3 (patch) | |
| tree | 7a5af59ce078cb66fb17ec33cf111ffc8d5fb328 /release/scripts/startup/bl_ui/properties_material.py | |
| parent | 57329304b061efe756e3a4ce1b828e9a7c7f7030 (diff) | |
Remove workspace object mode, reverts changes w/ 2.8
This caused too many problems syncing object modes
with multiple objects/windows/workspaces, see: D3130 for details.
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_material.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_material.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index dfbf3eab244..edbe6816e5b 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -148,7 +148,7 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel, Panel): col.operator("object.material_slot_move", icon='TRIA_UP', text="").direction = 'UP' col.operator("object.material_slot_move", icon='TRIA_DOWN', text="").direction = 'DOWN' - if context.workspace.object_mode == 'EDIT': + if ob.mode == 'EDIT': row = layout.row(align=True) row.operator("object.material_slot_assign", text="Assign") row.operator("object.material_slot_select", text="Select") @@ -1094,7 +1094,7 @@ class EEVEE_MATERIAL_PT_context_material(MaterialButtonsPanel, Panel): col.operator("object.material_slot_move", icon='TRIA_UP', text="").direction = 'UP' col.operator("object.material_slot_move", icon='TRIA_DOWN', text="").direction = 'DOWN' - if context.workspace.object_mode == 'EDIT': + if ob.mode == 'EDIT': row = layout.row(align=True) row.operator("object.material_slot_assign", text="Assign") row.operator("object.material_slot_select", text="Select") |