[Bf-blender-cvs] [8fc1be0c2b6] greasepencil-object: GPencil: Fix unreported error in Brush option panel

[Antonioya]

Commit: 8fc1be0c2b6f8e93e49b6072ecb09f8d886726d4
Author: Antonioya
Date:   Thu Jul 18 19:52:52 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB8fc1be0c2b6f8e93e49b6072ecb09f8d886726d4

GPencil: Fix unreported error in Brush option panel

The options of the material are from object material not pinned material.

If the brush is pinned, the material must be the brush material and not the object material.

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

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 d8f214028ea..49bc27e4ff1 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1781,7 +1781,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_option(View3DPanel, Panel):
             col.prop(gp_settings, "angle_factor", text="Factor", slider=True)
 
             ob = context.object
-            if ob:
+            if ob and brush.gpencil_settings.use_material_pin is False:
                 ma = ob.active_material
             elif brush.gpencil_settings.material:
                 ma = brush.gpencil_settings.material