blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Fix: Color Picker and Color Palette panels were appearing for non-color tools in Vertex Paint mode 

Use correct poll method for both modes
This commit is contained in:
William Reynish 2019-03-19 19:31:36 +01:00
parent bdf7843571
commit 770b1188e9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@ -403,9 +403,13 @@ class VIEW3D_PT_tools_brush_color(Panel, View3DPaintPanel):
def poll(self, context):
settings = self.paint_settings(context)
brush = settings.brush
capabilities = brush.image_paint_capabilities
if context.image_paint_object:
capabilities = brush.image_paint_capabilities
return capabilities.has_color and (context.image_paint_object or context.vertex_paint_object)
elif context.vertex_paint_object:
capabilities = brush.vertex_paint_capabilities
return capabilities.has_color
def draw(self, context):
layout = self.layout
@ -427,9 +431,13 @@ class VIEW3D_PT_tools_brush_swatches(Panel, View3DPaintPanel):
def poll(self, context):
settings = self.paint_settings(context)
brush = settings.brush
capabilities = brush.image_paint_capabilities
if context.image_paint_object:
capabilities = brush.image_paint_capabilities
return capabilities.has_color and (context.image_paint_object or context.vertex_paint_object)
elif context.vertex_paint_object:
capabilities = brush.vertex_paint_capabilities
return capabilities.has_color
def draw(self, context):
layout = self.layout