[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60128] trunk/blender/source/blender: fix weird issue after last commit where grab brush would not work and

[Antony Riakiotakis]

Revision: 60128
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60128
Author:   psy-fi
Date:     2013-09-14 00:35:41 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
fix weird issue after last commit where grab brush would not work and
also warnings fix and description fix.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
    trunk/blender/source/blender/makesrna/intern/rna_brush.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2013-09-14 00:32:58 UTC (rev 60127)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2013-09-14 00:35:41 UTC (rev 60128)
@@ -951,7 +951,7 @@
                           const float fno[3],
                           const float mask)
 {
-	const StrokeCache *cache = ss->cache;
+	StrokeCache *cache = ss->cache;
 	const Scene *scene = cache->vc->scene;
 	MTex *mtex = &br->mtex;
 	float avg = 1;
@@ -1289,13 +1289,13 @@
 
 /* Test whether the StrokeCache.sculpt_normal needs update in
  * do_brush_action() */
-static int brush_needs_sculpt_normal(const Brush *brush)
+static int brush_needs_sculpt_normal(const Brush *brush, SculptSession *ss)
 {
 	return ((ELEM(brush->sculpt_tool,
 	              SCULPT_TOOL_GRAB,
 	              SCULPT_TOOL_SNAKE_HOOK) &&
 	         ((brush->normal_weight > 0) ||
-	          (brush->flag & BRUSH_FRONTFACE))) ||
+	          ss->cache->frontface)) ||
 
 	        ELEM7(brush->sculpt_tool,
 	              SCULPT_TOOL_BLOB,
@@ -3139,7 +3139,7 @@
 			BKE_pbvh_node_mark_update(nodes[n]);
 		}
 
-		if (brush_needs_sculpt_normal(brush))
+		if (brush_needs_sculpt_normal(brush, ss))
 			update_sculpt_normal(sd, ob, nodes, totnode);
 
 		if (brush->mtex.brush_map_mode == MTEX_MAP_MODE_AREA)

Modified: trunk/blender/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_brush.c	2013-09-14 00:32:58 UTC (rev 60127)
+++ trunk/blender/source/blender/makesrna/intern/rna_brush.c	2013-09-14 00:35:41 UTC (rev 60128)
@@ -562,7 +562,7 @@
 	SCULPT_TOOL_CAPABILITY(has_smooth_stroke, "Has Smooth Stroke");
 	SCULPT_TOOL_CAPABILITY(has_space_attenuation, "Has Space Attenuation");
 	SCULPT_TOOL_CAPABILITY(has_strength, "Has Strength");
-	SCULPT_TOOL_CAPABILITY(has_frontface, "Has Strength");
+	SCULPT_TOOL_CAPABILITY(has_frontface, "Has Front Facing");
 
 #undef SCULPT_CAPABILITY
 }