[Bf-blender-cvs] [23ea4b56ada] master: GPencil: Fix showing wrong material in brush panel with pinning

[Antonioya]

Commit: 23ea4b56adab66dbc0aa8c095c49c8f2e6a5d92b
Author: Antonioya
Date:   Thu Jul 18 19:52:52 2019 +0200
Branches: master
https://developer.blender.org/rB23ea4b56adab66dbc0aa8c095c49c8f2e6a5d92b

GPencil: Fix showing wrong material in brush panel with pinning

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 e7be73391b7..730bad796db 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