[Bf-blender-cvs] [39b32676d28] greasepencil-object: GPencil: Fix error with material context

[Antonioya]

Commit: 39b32676d28e3b92f811e23d5f06a75e7317ea4d
Author: Antonioya
Date:   Tue Apr 9 16:43:45 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB39b32676d28e3b92f811e23d5f06a75e7317ea4d

GPencil: Fix error with material context

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 365cbe0781f..7c1fa0f9663 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1716,9 +1716,9 @@ class VIEW3D_PT_tools_grease_pencil_brush_option(View3DPanel, Panel):
         layout.use_property_decorate = False
 
         brush = context.tool_settings.gpencil_paint.brush
-        gp_settings = brush.gpencil_settings
 
         if brush is not None:
+            gp_settings = brush.gpencil_settings
             col = layout.column(align=True)
             col.prop(gp_settings, "input_samples")
             col.separator()
@@ -1729,7 +1729,10 @@ class VIEW3D_PT_tools_grease_pencil_brush_option(View3DPanel, Panel):
             col.prop(gp_settings, "angle", slider=True)
             col.prop(gp_settings, "angle_factor", text="Factor", slider=True)
 
-            ma = context.material
+            ob = context.object
+            if ob:
+                ma = ob.active_material
+                    
             if brush.gpencil_settings.material:
                 ma = brush.gpencil_settings.material