[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55181] trunk/blender: Jitter: Change UI.

Antony Riakiotakis kalast at gmail.com
Mon Mar 11 02:46:23 CET 2013


Revision: 55181
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55181
Author:   psy-fi
Date:     2013-03-11 01:46:22 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
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!

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_image.py
    trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    trunk/blender/source/blender/makesrna/intern/rna_brush.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_image.py	2013-03-10 20:05:18 UTC (rev 55180)
+++ trunk/blender/release/scripts/startup/bl_ui/space_image.py	2013-03-11 01:46:22 UTC (rev 55181)
@@ -698,13 +698,13 @@
             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")
 

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-03-10 20:05:18 UTC (rev 55180)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2013-03-11 01:46:22 UTC (rev 55181)
@@ -678,14 +678,14 @@
             self.prop_unified_strength(row, context, brush, "use_pressure_strength")
 
             row = col.row(align=True)
-            if(brush.use_absolute_jitter):
+            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")
-            else:
-                row.prop(brush, "jitter", slider=True)
             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 @@
             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 @@
                 col.separator()
 
                 row = col.row(align=True)
-                if(brush.use_absolute_jitter):
+                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")
-                else:
-                    row.prop(brush, "jitter", slider=True)
                 row.prop(brush, "use_pressure_jitter", toggle=True, text="")
-          
-                col.prop(brush, "use_absolute_jitter")
 
         else:
             col.prop(brush, "use_airbrush")

Modified: trunk/blender/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_brush.c	2013-03-10 20:05:18 UTC (rev 55180)
+++ trunk/blender/source/blender/makesrna/intern/rna_brush.c	2013-03-11 01:46:22 UTC (rev 55181)
@@ -633,14 +633,15 @@
 
 	prop = RNA_def_property(srna, "jitter", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "jitter");
-	RNA_def_property_range(prop, 0.0f, 1.0f);
+	RNA_def_property_range(prop, 0.0f, 1000.0f);
+	RNA_def_property_ui_range(prop, 0.0f, 2.0f, 0.1, 4);
 	RNA_def_property_ui_text(prop, "Jitter", "Jitter the position of the brush while painting");
 	RNA_def_property_update(prop, 0, "rna_Brush_update");
 
 	prop = RNA_def_property(srna, "jitter_absolute", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "jitter_absolute");
 	RNA_def_property_range(prop, 0, 1000000);
-	RNA_def_property_ui_text(prop, "Absolute Jitter", "Jitter the position of the brush while painting in pixels");
+	RNA_def_property_ui_text(prop, "Jitter", "Jitter the position of the brush in pixels while painting");
 	RNA_def_property_update(prop, 0, "rna_Brush_update");
 
 	prop = RNA_def_property(srna, "spacing", PROP_INT, PROP_PERCENTAGE);
@@ -799,8 +800,8 @@
 	RNA_def_property_ui_text(prop, "Rake", "Rotate the brush texture to match the stroke direction");
 	RNA_def_property_update(prop, 0, "rna_Brush_update");
 
-	prop = RNA_def_property(srna, "use_absolute_jitter", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_ABSOLUTE_JITTER);
+	prop = RNA_def_property(srna, "use_relative_jitter", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", BRUSH_ABSOLUTE_JITTER);
 	RNA_def_property_ui_text(prop, "Absolute Jitter", "Jittering happens in screen space, not relative to brush size");
 	RNA_def_property_update(prop, 0, "rna_Brush_update");
 




More information about the Bf-blender-cvs mailing list