diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-12-19 10:12:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-12-19 12:05:40 +0300 |
commit | f7611126b6f1382f60e84433a1d1a05c5679d29a (patch) | |
tree | a50d0b4c6adb7586ee57bce6d6bd1efd8cc0b76e /release/scripts/startup/bl_ui/space_view3d_toolbar.py | |
parent | 4440739699bb237da8126168117e501aec770e89 (diff) |
Fix error drawing paint UI without a brush
Note that this removes image_paint.detect_data from
UnifiedPaintPanel.get_brush_mode, I can't see why it's needed,
it causes issues where the texture paint UI isn't used when it can be.
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d_toolbar.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 99e50f8ccef..07ebacfb77f 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -400,6 +400,11 @@ class VIEW3D_PT_tools_brush_settings(Panel, View3DPaintBrushPanel): bl_context = ".paint_common" bl_label = "Brush Settings" + @classmethod + def poll(cls, context): + settings = cls.paint_settings(context) + return settings and settings.brush is not None + def draw(self, context): layout = self.layout @@ -491,8 +496,7 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel): @classmethod def poll(cls, context): brush = context.tool_settings.image_paint.brush - ob = context.active_object - return (brush is not None and ob is not None) + return (brush is not None and context.active_object is not None) def draw(self, context): layout = self.layout @@ -1373,12 +1377,13 @@ class VIEW3D_PT_tools_grease_pencil_brush_select(Panel, View3DPanel, GreasePenci if context.mode == 'PAINT_GPENCIL': brush = tool_settings.gpencil_paint.brush - gp_settings = brush.gpencil_settings + if brush is not None: + gp_settings = brush.gpencil_settings - col.prop(brush, "use_custom_icon", toggle=True, icon='FILE_IMAGE', text="") + col.prop(brush, "use_custom_icon", toggle=True, icon='FILE_IMAGE', text="") - if brush.use_custom_icon: - layout.row().prop(brush, "icon_filepath", text="") + if brush.use_custom_icon: + layout.row().prop(brush, "icon_filepath", text="") class VIEW3D_PT_tools_grease_pencil_brush_settings(Panel, View3DPanel, GreasePencilPanel): |