[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30772] trunk/blender/source/blender/ editors/sculpt_paint/paint_stroke.c: Saved a call to 'brush_alpha'

[Jason Wilkins]

Revision: 30772
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30772
Author:   jwilkins
Date:     2010-07-26 22:05:08 +0200 (Mon, 26 Jul 2010)

Log Message:
-----------
Saved a call to 'brush_alpha'

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c	2010-07-26 19:59:33 UTC (rev 30771)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c	2010-07-26 20:05:08 UTC (rev 30772)
@@ -540,7 +540,7 @@
 
 	view3d_set_viewcontext(C, &vc);
 
-	if (0 && vc.obact->sculpt) {
+	if (vc.obact->sculpt) {
 		Paint *paint = paint_get_active(CTX_data_scene(C));
 		Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
 		Brush *brush = paint_brush(paint);
@@ -556,7 +556,8 @@
 		float* col;
 		float  alpha;
 
-		float visual_strength = brush_alpha(brush)*brush_alpha(brush);
+		const float root_alpha = brush_alpha(brush);
+		float visual_strength = root_alpha*root_alpha;
 
 		const float min_alpha = 0.20f;
 		const float max_alpha = 0.80f;
@@ -581,7 +582,7 @@
 			return;
 
 		hit = sculpt_get_brush_geometry(C, x, y, &pixel_radius, location, modelview, projection, viewport);
-
+return;
 		if (brush_use_locked_size(brush))
 			brush_set_size(brush, pixel_radius);