[Bf-blender-cvs] [9f2f2ed] master: Fix part of T38280: UI inconsistencies in the texture/image paint stroke panels.

Brecht Van Lommel noreply at git.blender.org
Mon Jan 20 16:58:13 CET 2014


Commit: 9f2f2ed546b6577b246f7b41e79d2c5c17b77e70
Author: Brecht Van Lommel
Date:   Mon Jan 20 15:01:33 2014 +0100
https://developer.blender.org/rB9f2f2ed546b6577b246f7b41e79d2c5c17b77e70

Fix part of T38280: UI inconsistencies in the texture/image paint stroke panels.

===================================================================

M	release/scripts/startup/bl_ui/space_image.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index c9a7957..cb22ee7 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -834,9 +834,6 @@ class IMAGE_PT_paint_stroke(BrushButtonsPanel, Panel):
         brush = toolsettings.brush
 
         col = layout.column()
-        col.prop(toolsettings, "input_samples")
-
-        col = layout.column()
 
         col.label(text="Stroke Method:")
 
@@ -860,6 +857,18 @@ class IMAGE_PT_paint_stroke(BrushButtonsPanel, Panel):
         col = layout.column()
         col.separator()
 
+        row = col.row(align=True)
+        if brush.use_relative_jitter:
+            row.prop(brush, "use_relative_jitter", text="", icon='LOCKED')
+            row.prop(brush, "jitter", slider=True)
+        else:
+            row.prop(brush, "use_relative_jitter", text="", icon='UNLOCKED')
+            row.prop(brush, "jitter_absolute")
+        row.prop(brush, "use_pressure_jitter", toggle=True, text="")
+
+        col = layout.column()
+        col.separator()
+
         col.prop(brush, "use_smooth_stroke")
 
         sub = col.column()
@@ -869,14 +878,9 @@ class IMAGE_PT_paint_stroke(BrushButtonsPanel, Panel):
 
         col.separator()
 
-        row = col.row(align=True)
-        if brush.use_relative_jitter:
-            row.prop(brush, "use_relative_jitter", text="", icon='LOCKED')
-            row.prop(brush, "jitter", slider=True)
-        else:
-            row.prop(brush, "use_relative_jitter", text="", icon='UNLOCKED')
-            row.prop(brush, "jitter_absolute")
-        row.prop(brush, "use_pressure_jitter", toggle=True, text="")
+        col.prop(toolsettings, "input_samples")
+
+        col.separator()
 
         col.prop(brush, "use_wrap")




More information about the Bf-blender-cvs mailing list