Jitter: Change UI. Now use lock icon to indicate relative jitter, tied

to brush size, and unlock icon to indicate absolute jitter untied to
brush size, in screen pixels. Also relative jitter now has soft UI limit
of 2.0 and a hard limit of 1000 times the size of the brush. Should be
enough for the most vivid imaginations...I hope!

2 files changed, 20 insertions, 20 deletions

diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 6a8054dd5d6..c5486dd72d8 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -698,13 +698,13 @@ class IMAGE_PT_paint(Panel, ImagePaintPanel):
             self.prop_unified_strength(row, context, brush, "use_pressure_strength")
 
             row = col.row(align=True)
-            if(brush.use_absolute_jitter):
-                row.prop(brush, "jitter_absolute", slider=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, "jitter", slider=True)
+               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(brush, "use_absolute_jitter")
 
             col.prop(brush, "blend", text="Blend")
 
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 24a216fe020..3bd2f642e0b 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -678,14 +678,14 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
             self.prop_unified_strength(row, context, brush, "use_pressure_strength")
 
             row = col.row(align=True)
-            if(brush.use_absolute_jitter):
-                row.prop(brush, "jitter_absolute")
-            else:
+            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(brush, "use_absolute_jitter")
-
             col.prop(brush, "blend", text="Blend")
 
             col = layout.column()
@@ -711,13 +711,13 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
             self.prop_unified_strength(row, context, brush, "use_pressure_strength")
 
             row = col.row(align=True)
-            if(brush.use_absolute_jitter):
-                row.prop(brush, "jitter_absolute")
+            if(brush.use_relative_jitter):
+               row.prop(brush, "use_relative_jitter", text="", icon='LOCKED')
+               row.prop(brush, "jitter", slider=True)
             else:
-                row.prop(brush, "jitter", slider=True)
+               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(brush, "use_absolute_jitter")
 
             col.prop(brush, "vertex_tool", text="Blend")
 
@@ -838,13 +838,13 @@ class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel):
                 col.separator()
 
                 row = col.row(align=True)
-                if(brush.use_absolute_jitter):
-                    row.prop(brush, "jitter_absolute")
-                else:
+                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(brush, "use_absolute_jitter")
 
         else:
             col.prop(brush, "use_airbrush")