[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30144] branches/soc-2010-jwilkins/source/ blender/blenkernel/intern/brush.c: * bug fix: fkey resizing wasn' t taking into consideration unified size and strength

[Jason Wilkins]

Revision: 30144
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30144
Author:   jwilkins
Date:     2010-07-09 10:23:31 +0200 (Fri, 09 Jul 2010)

Log Message:
-----------
* bug fix: fkey resizing wasn't taking into consideration unified size and strength

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c

Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c	2010-07-09 08:15:06 UTC (rev 30143)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c	2010-07-09 08:23:31 UTC (rev 30144)
@@ -1032,9 +1032,9 @@
 	float original_value= 0;
 
 	if(mode == WM_RADIALCONTROL_SIZE)
-		original_value = br->size * size_weight;
+		original_value = sculpt_get_brush_size(br) * size_weight;
 	else if(mode == WM_RADIALCONTROL_STRENGTH)
-		original_value = br->alpha;
+		original_value = sculpt_get_brush_alpha(br);
 	else if(mode == WM_RADIALCONTROL_ANGLE) {
 		MTex *mtex = brush_active_texture(br);
 		if(mtex)