[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30110] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint/paint_stroke.c: * The 30k commit was a bit buggy...

Jason Wilkins Jason.A.Wilkins at gmail.com
Thu Jul 8 13:19:55 CEST 2010


Revision: 30110
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30110
Author:   jwilkins
Date:     2010-07-08 13:19:55 +0200 (Thu, 08 Jul 2010)

Log Message:
-----------
* The 30k commit was a bit buggy...
Operator precedence ftw!

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c	2010-07-08 10:08:02 UTC (rev 30109)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c	2010-07-08 11:19:55 UTC (rev 30110)
@@ -817,10 +817,10 @@
 	output[0] = event->x;
 	output[1] = event->y;
 
-	if (stroke->brush->flag & BRUSH_SMOOTH_STROKE &&  
+	if ((stroke->brush->flag & BRUSH_SMOOTH_STROKE) &&  
 	    !ELEM4(stroke->brush->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_THUMB, SCULPT_TOOL_ROTATE, SCULPT_TOOL_SNAKE_HOOK) &&
-	    !stroke->brush->flag & BRUSH_ANCHORED &&
-	    !stroke->brush->flag & BRUSH_RESTORE_MESH)
+	    !(stroke->brush->flag & BRUSH_ANCHORED) &&
+	    !(stroke->brush->flag & BRUSH_RESTORE_MESH))
 	{
 		float u = stroke->brush->smooth_stroke_factor, v = 1.0 - u;
 		float dx = stroke->last_mouse_position[0] - event->x, dy = stroke->last_mouse_position[1] - event->y;





More information about the Bf-blender-cvs mailing list