Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-10-30 19:07:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-10-30 19:16:48 +0300
commitd9bce6bcf5bcc1c34d6e24adcc8babe757ae827d (patch)
tree304fa80505eff6aa3ee91cb37b0bb4eb47e894aa /release/scripts/startup/bl_ui/space_view3d_toolbar.py
parent5043003584e223d996e94abb1dc68e9d80d20d76 (diff)
Fix image paint showing project-paint settings
Also make projpaint a keyword-only argument to avoid copy-paste errors like this re-occurring in the future.
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d_toolbar.py')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d_toolbar.py12
1 files changed, 6 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 a4100003340..bef1f510ec7 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -503,7 +503,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
# Texture Paint Mode #
elif context.image_paint_object and brush:
- brush_texpaint_common(self, context, layout, brush, settings, True)
+ brush_texpaint_common(self, context, layout, brush, settings, projpaint=True)
# Weight Paint Mode #
elif context.weight_paint_object and brush:
@@ -551,15 +551,15 @@ class VIEW3D_PT_tools_brush_color(Panel, View3DPaintPanel):
brush = settings.brush
if context.vertex_paint_object:
- brush_texpaint_common_color(self, context, layout, brush, settings, True)
+ brush_texpaint_common_color(self, context, layout, brush, settings, projpaint=True)
else:
layout.prop(brush, "color_type", expand=True)
if brush.color_type == 'COLOR':
- brush_texpaint_common_color(self, context, layout, brush, settings, True)
+ brush_texpaint_common_color(self, context, layout, brush, settings, projpaint=True)
elif brush.color_type == 'GRADIENT':
- brush_texpaint_common_gradient(self, context, layout, brush, settings, True)
+ brush_texpaint_common_gradient(self, context, layout, brush, settings, projpaint=True)
class VIEW3D_PT_tools_brush_swatches(Panel, View3DPaintPanel):
@@ -613,7 +613,7 @@ class VIEW3D_PT_tools_brush_clone(Panel, View3DPaintPanel):
layout.active = settings.use_clone_layer
- brush_texpaint_common_clone(self, context, layout, brush, settings, True)
+ brush_texpaint_common_clone(self, context, layout, brush, settings, projpaint=True)
class VIEW3D_PT_tools_brush_options(Panel, View3DPaintPanel):
@@ -635,7 +635,7 @@ class VIEW3D_PT_tools_brush_options(Panel, View3DPaintPanel):
col = layout.column()
if context.image_paint_object and brush:
- brush_texpaint_common_options(self, context, layout, brush, settings, True)
+ brush_texpaint_common_options(self, context, layout, brush, settings, projpaint=True)
elif context.sculpt_object and brush:
col.prop(brush, "use_automasking_topology")