[Bf-blender-cvs] [309b6378d31] greasepencil-object: UI: Fix object mode after merge

[Antonio Vazquez]

Commit: 309b6378d31565118ac657db42691ba13a724b90
Author: Antonio Vazquez
Date:   Fri Apr 6 14:25:36 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB309b6378d31565118ac657db42691ba13a724b90

UI: Fix object mode after merge

===================================================================

M	release/scripts/startup/bl_ui/space_view3d.py
M	release/scripts/startup/bl_ui/space_view3d_toolbar.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 0d4e2a60b57..3c61ab240a9 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -198,7 +198,7 @@ class VIEW3D_MT_editor_menus(Menu):
         mode_string = context.mode
         edit_object = context.edit_object
         gp_edit = context.active_object and \
-                  workspace.object_mode in {'GPENCIL_EDIT', 'GPENCIL_PAINT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}
+                  context.active_object.mode in {'GPENCIL_EDIT', 'GPENCIL_PAINT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}
 
         layout.menu("VIEW3D_MT_view")
 
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 0b7098ac322..56bf033428d 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -65,9 +65,8 @@ def draw_vpaint_symmetry(layout, vpaint):
 
 # Most of these panels should not be visible in GP edit modes
 def is_not_gpencil_edit_mode(context):
-    workspace = context.workspace
     is_gpmode = context.active_object and \
-                workspace.object_mode in {'GPENCIL_EDIT', 'GPENCIL_PAINT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}
+                context.active_object.mode in {'GPENCIL_EDIT', 'GPENCIL_PAINT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}
     return not is_gpmode
 
 
@@ -2279,12 +2278,11 @@ class VIEW3D_PT_tools_grease_pencil_animation(Panel):
 
     @classmethod
     def poll(cls, context):
-        workspace = context.workspace
         if context.gpencil_data is None:
             return False
         elif context.space_data.type != 'VIEW_3D':
             return False
-        elif workspace.object_mode == 'OBJECT':
+        elif context.active_object.mode == 'OBJECT':
             return False
 
         return True
@@ -2490,7 +2488,7 @@ class VIEW3D_PT_tools_grease_pencil_appearance(Panel):
         workspace = context.workspace
         if context.active_object:
             brush = context.active_gpencil_brush
-            return workspace.object_mode in {'GPENCIL_PAINT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}
+            return context.active_object.mode in {'GPENCIL_PAINT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}
             
         return False
 
@@ -2499,7 +2497,7 @@ class VIEW3D_PT_tools_grease_pencil_appearance(Panel):
         layout = self.layout
         workspace = context.workspace
 
-        if workspace.object_mode == 'GPENCIL_PAINT':
+        if context.active_object.mode == 'GPENCIL_PAINT':
             brush = context.active_gpencil_brush
             
             col = layout.column(align=True)
@@ -2531,7 +2529,7 @@ class VIEW3D_PT_tools_grease_pencil_appearance(Panel):
                 row = col.row(align=True)
                 row.prop(brush, "cursor_color_add", text="Color")
 
-        elif workspace.object_mode in ('GPENCIL_SCULPT', 'GPENCIL_WEIGHT'):
+        elif context.active_object.mode in ('GPENCIL_SCULPT', 'GPENCIL_WEIGHT'):
             settings = context.tool_settings.gpencil_sculpt
             brush = settings.brush