diff options
| author | Antonioya <blendergit@gmail.com> | 2019-07-18 20:52:52 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-07-19 16:22:42 +0300 |
| commit | 23ea4b56adab66dbc0aa8c095c49c8f2e6a5d92b (patch) | |
| tree | a196d5eec803bb6016f9b7ea37c6490ed9ced889 /release/scripts/startup/bl_ui | |
| parent | d5c0a02f8677211e4857c9d446b23c8561defb62 (diff) | |
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.
Diffstat (limited to 'release/scripts/startup/bl_ui')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |