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>2010-02-02 20:41:32 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-02-02 20:41:32 +0300
commitc8b69b07c4e549cc18e26666e176a78c033e2be0 (patch)
tree7fb7baf2e6888bf1882b781af41083c5e70292e3 /release
parentd121c0153b0403716abea6076f7cb8236f98e6c8 (diff)
Fix #20926: 2d image paint was missing clone image, clone alpha, and wrap
option in the UI, also fixes missing refresh when changing these and wrong order in keymap for clone grabbing operator.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/ui/space_image.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py
index da9151906ba..3aaebd0b7a0 100644
--- a/release/scripts/ui/space_image.py
+++ b/release/scripts/ui/space_image.py
@@ -491,10 +491,10 @@ class IMAGE_PT_paint(bpy.types.Panel):
sub = layout.row(align=True)
else:
sub = layout.column(align=True)
- sub.prop_enum(toolsettings, "tool", 'DRAW')
- sub.prop_enum(toolsettings, "tool", 'SOFTEN')
- sub.prop_enum(toolsettings, "tool", 'CLONE')
- sub.prop_enum(toolsettings, "tool", 'SMEAR')
+ sub.prop_enum(brush, "imagepaint_tool", 'DRAW')
+ sub.prop_enum(brush, "imagepaint_tool", 'SOFTEN')
+ sub.prop_enum(brush, "imagepaint_tool", 'CLONE')
+ sub.prop_enum(brush, "imagepaint_tool", 'SMEAR')
if brush:
col = layout.column()
@@ -515,6 +515,10 @@ class IMAGE_PT_paint(bpy.types.Panel):
col.prop(brush, "blend", text="Blend")
+ if brush.imagepaint_tool == 'CLONE':
+ col.separator()
+ col.prop(brush, "clone_image", text="Image")
+ col.prop(brush, "clone_alpha", text="Alpha")
class IMAGE_PT_paint_stroke(bpy.types.Panel):
bl_space_type = 'IMAGE_EDITOR'
@@ -544,6 +548,7 @@ class IMAGE_PT_paint_stroke(bpy.types.Panel):
row.prop(brush, "spacing", text="Distance", slider=True)
row.prop(brush, "use_spacing_pressure", toggle=True, text="")
+ layout.prop(brush, "use_wrap")
class IMAGE_PT_paint_curve(bpy.types.Panel):
bl_space_type = 'IMAGE_EDITOR'