2.5 UI:
authorThomas Dinges <blender@dingto.org>
Fri, 1 Apr 2011 20:36:27 +0000 (20:36 +0000)
committerThomas Dinges <blender@dingto.org>
Fri, 1 Apr 2011 20:36:27 +0000 (20:36 +0000)
*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!

release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_sculpt_paint.c

index 4636f1d..a4b3b9a 100644 (file)
@@ -522,7 +522,7 @@ class VIEW3D_PT_tools_brush(PaintPanel, bpy.types.Panel):
                 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 @@ class VIEW3D_PT_tools_brush(PaintPanel, bpy.types.Panel):
             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 @@ class VIEW3D_PT_tools_brush(PaintPanel, bpy.types.Panel):
             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 @@ class VIEW3D_PT_tools_brush(PaintPanel, bpy.types.Panel):
             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)
index 2d5dba4..09577fd 100644 (file)
@@ -430,7 +430,7 @@ static void rna_def_brush(BlenderRNA *brna)
        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);
index 6ba2f72..58f19fe 100644 (file)
@@ -469,7 +469,7 @@ static void rna_def_particle_edit(BlenderRNA *brna)
        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);