Commit: 770b1188e982edf1437a7e3ec33b8d934db718a3 Author: William Reynish Date: Tue Mar 19 19:31:36 2019 +0100 Branches: master https://developer.blender.org/rB770b1188e982edf1437a7e3ec33b8d934db718a3
Fix: Color Picker and Color Palette panels were appearing for non-color tools in Vertex Paint mode Use correct poll method for both modes =================================================================== 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 aa7b37aa965..9d2a3f9b476 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -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 + + elif context.vertex_paint_object: + capabilities = brush.vertex_paint_capabilities - return capabilities.has_color and (context.image_paint_object or context.vertex_paint_object) + 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 + + elif context.vertex_paint_object: + capabilities = brush.vertex_paint_capabilities - return capabilities.has_color and (context.image_paint_object or context.vertex_paint_object) + return capabilities.has_color def draw(self, context): layout = self.layout _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs