[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35945] trunk/blender: 2.5 UI:

[Thomas Dinges]

Revision: 35945
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35945
Author:   dingto
Date:     2011-04-01 20:36:27 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
2.5 UI:
*Brush option "size" had different naming in 3D View / Image Editor.
Ported back name "Radius" to RNA (Brush and ParticleBrush) 

Discovered by Bart Crouch. Thanks! 

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

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-04-01 18:35:49 UTC (rev 35944)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-04-01 20:36:27 UTC (rev 35945)
@@ -522,7 +522,7 @@
                 row.prop(brush, "unprojected_radius", text="Radius", slider=True)
             else:
                 row.prop(brush, "use_locked_size", toggle=True, text="", icon='UNLOCKED')
-                row.prop(brush, "size", text="Radius", slider=True)
+                row.prop(brush, "size", slider=True)
 
             row.prop(brush, "use_pressure_size", toggle=True, text="")
 
@@ -625,7 +625,7 @@
             col.prop(brush, "color", text="")
 
             row = col.row(align=True)
-            row.prop(brush, "size", text="Radius", slider=True)
+            row.prop(brush, "size", slider=True)
             row.prop(brush, "use_pressure_size", toggle=True, text="")
 
             row = col.row(align=True)
@@ -650,7 +650,7 @@
             col = layout.column()
 
             row = col.row(align=True)
-            row.prop(brush, "size", text="Radius", slider=True)
+            row.prop(brush, "size", slider=True)
             row.prop(brush, "use_pressure_size", toggle=True, text="")
 
             row = col.row(align=True)
@@ -668,7 +668,7 @@
             col.prop(brush, "color", text="")
 
             row = col.row(align=True)
-            row.prop(brush, "size", text="Radius", slider=True)
+            row.prop(brush, "size", slider=True)
             row.prop(brush, "use_pressure_size", toggle=True, text="")
 
             row = col.row(align=True)

Modified: trunk/blender/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_brush.c	2011-04-01 18:35:49 UTC (rev 35944)
+++ trunk/blender/source/blender/makesrna/intern/rna_brush.c	2011-04-01 20:36:27 UTC (rev 35945)
@@ -430,7 +430,7 @@
 	RNA_def_property_int_funcs(prop, "rna_Brush_get_size", "rna_Brush_set_size", NULL);
 	RNA_def_property_range(prop, 1, MAX_BRUSH_PIXEL_RADIUS*10);
 	RNA_def_property_ui_range(prop, 1, MAX_BRUSH_PIXEL_RADIUS, 1, 0);
-	RNA_def_property_ui_text(prop, "Size", "Radius of the brush in pixels");
+	RNA_def_property_ui_text(prop, "Radius", "Radius of the brush in pixels");
 	RNA_def_property_update(prop, 0, "rna_Brush_update");
 	
 	prop= RNA_def_property(srna, "unprojected_radius", PROP_FLOAT, PROP_DISTANCE);

Modified: trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c	2011-04-01 18:35:49 UTC (rev 35944)
+++ trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c	2011-04-01 20:36:27 UTC (rev 35945)
@@ -469,7 +469,7 @@
 	prop= RNA_def_property(srna, "size", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 1, SHRT_MAX);
 	RNA_def_property_ui_range(prop, 1, 100, 10, 3);
-	RNA_def_property_ui_text(prop, "Size", "Brush size");
+	RNA_def_property_ui_text(prop, "Radius", "Radius of the brush in pixels");
 
 	prop= RNA_def_property(srna, "strength", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.001, 1.0);