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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-30 14:32:02 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-30 14:32:02 +0400
commit3b04b861bd964a54ee88defe899978ae564cb037 (patch)
tree1b30114cefe34686bb870f97eced701c96b381b9 /release/scripts/startup/bl_ui/space_image.py
parent9461af89f1da9d4d1f4eef952084bbc7711376d7 (diff)
Fix another part of #35141: there was no way to reset the stencil transform after e.g.
scaling it along one axis, now there's a Reset Transform button. The Image Aspect button is now also hidden unless the texture is an image texture. And also hide the color wheel for painting tools that don't use colors.
Diffstat (limited to 'release/scripts/startup/bl_ui/space_image.py')
-rw-r--r--release/scripts/startup/bl_ui/space_image.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 3acab7200ea..458266aec46 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -696,8 +696,10 @@ class IMAGE_PT_paint(Panel, ImagePaintPanel):
if brush:
col = layout.column()
- col.template_color_picker(brush, "color", value_slider=True)
- col.prop(brush, "color", text="")
+
+ if brush.image_tool == 'DRAW' and brush.blend not in ('ERASE_ALPHA', 'ADD_ALPHA'):
+ col.template_color_picker(brush, "color", value_slider=True)
+ col.prop(brush, "color", text="")
row = col.row(align=True)
self.prop_unified_size(row, context, brush, "size", slider=True, text="Radius")