[Bf-blender-cvs] [6d32c7865fa] master: GPencil: Fix unreported missing context menu for pinned mode

Antonio Vazquez noreply at git.blender.org
Fri Sep 25 15:50:42 CEST 2020


Commit: 6d32c7865fa3b5015bfbbc73fd846c6f1b22dcfe
Author: Antonio Vazquez
Date:   Fri Sep 25 15:50:06 2020 +0200
Branches: master
https://developer.blender.org/rB6d32c7865fa3b5015bfbbc73fd846c6f1b22dcfe

GPencil: Fix unreported missing context menu for pinned mode

When the mode was pinned, the context menu did not display the color wheel for the vertex color mode.

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index bbe23bc8bbc..ab904aa0d99 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -7132,7 +7132,8 @@ class VIEW3D_PT_gpencil_draw_context_menu(Panel):
         gp_settings = brush.gpencil_settings
 
         layout = self.layout
-        is_vertex = settings.color_mode == 'VERTEXCOLOR' or brush.gpencil_tool == 'TINT'
+        is_pin_vertex = gp_settings.brush_draw_mode == 'VERTEXCOLOR'
+        is_vertex = settings.color_mode == 'VERTEXCOLOR' or brush.gpencil_tool == 'TINT' or is_pin_vertex
 
         if brush.gpencil_tool not in {'ERASE', 'CUTTER', 'EYEDROPPER'} and is_vertex:
             split = layout.split(factor=0.1)



More information about the Bf-blender-cvs mailing list