[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48203] branches/soc-2012-bratwurst: Rename 'Zoom Scale' to 'Radius Sync'

[Antony Riakiotakis]

Revision: 48203
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48203
Author:   psy-fi
Date:     2012-06-22 16:54:01 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
Rename 'Zoom Scale' to 'Radius Sync'

Modified Paths:
--------------
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_brush.c

Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2012-06-22 16:53:34 UTC (rev 48202)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2012-06-22 16:54:01 UTC (rev 48203)
@@ -497,7 +497,7 @@
                     col.prop(brush, "strength", slider=True)
 
                 row = col.row(align=True)
-                col.prop(brush, "zoom_scale")
+                col.prop(brush, "radius_sync")
 
             if tool == 'ADD':
                 col.prop(brush, "count")

Modified: branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_edit.c	2012-06-22 16:53:34 UTC (rev 48202)
+++ branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_edit.c	2012-06-22 16:54:01 UTC (rev 48203)
@@ -1458,7 +1458,7 @@
 	Paint *p = paint_get_active(scene);
 	Brush *brush = paint_brush(p);
 
-	if (brush && (brush->flag & BRUSH_ZOOM_SCALE))
+	if (brush && (brush->flag & BRUSH_RADIUS_SYNC))
 	{
 		int oldsize = BKE_brush_size_get(scene, brush);
 		int newsize = oldsize*factor + 0.5;

Modified: branches/soc-2012-bratwurst/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- branches/soc-2012-bratwurst/source/blender/makesdna/DNA_brush_types.h	2012-06-22 16:53:34 UTC (rev 48202)
+++ branches/soc-2012-bratwurst/source/blender/makesdna/DNA_brush_types.h	2012-06-22 16:54:01 UTC (rev 48203)
@@ -142,7 +142,7 @@
 	/* temporary flag which sets up automatically for correct brush
 	 * drawing when inverted modal operator is running */
 	BRUSH_INVERTED = (1 << 29),
-	BRUSH_ZOOM_SCALE = (1 << 30)
+	BRUSH_RADIUS_SYNC = (1 << 30)
 } BrushFlags;
 
 /* Brush.sculpt_tool */

Modified: branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_brush.c	2012-06-22 16:53:34 UTC (rev 48202)
+++ branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_brush.c	2012-06-22 16:54:01 UTC (rev 48203)
@@ -832,9 +832,9 @@
 	                         "Automatically adjust strength to give consistent results for different spacings");
 	RNA_def_property_update(prop, 0, "rna_Brush_update");
 
-	prop = RNA_def_property(srna, "zoom_scale", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_ZOOM_SCALE);
-	RNA_def_property_ui_text(prop, "Zoom Scale", "Resize the brush when zooming");
+	prop = RNA_def_property(srna, "radius_sync", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_RADIUS_SYNC);
+	RNA_def_property_ui_text(prop, "Radius Sync", "Resize the brush when zooming");
 	RNA_def_property_update(prop, 0, "rna_Brush_update");
 
 	/* adaptive space is not implemented yet */