[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29911] branches/soc-2010-jwilkins: renabling spacing for smooth, having it disable results in the brush seeming to freeze since it is processing so much more frequently .

[Tom Musgrove]

Revision: 29911
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29911
Author:   letterrip
Date:     2010-07-04 00:50:28 +0200 (Sun, 04 Jul 2010)

Log Message:
-----------
renabling spacing for smooth, having it disable results in the brush seeming to freeze since it is processing so much more frequently.  Jason the maximum iterations should probably be capped also.

Modified Paths:
--------------
    branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c

Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-07-03 22:25:22 UTC (rev 29910)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-07-03 22:50:28 UTC (rev 29911)
@@ -940,7 +940,7 @@
         col.separator()
 
         col = layout.column()
-        col.active = (not brush.use_anchor) and (brush.sculpt_tool not in ('GRAB', 'THUMB', 'ROTATE', 'SNAKE_HOOK', 'SMOOTH'))
+        col.active = (not brush.use_anchor) and (brush.sculpt_tool not in ('GRAB', 'THUMB', 'ROTATE', 'SNAKE_HOOK'))
 
         row = col.row()
         row.prop(brush, "use_space")

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-03 22:25:22 UTC (rev 29910)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c	2010-07-03 22:50:28 UTC (rev 29911)
@@ -810,7 +810,8 @@
 	output[0] = event->x;
 	output[1] = event->y;
 
-	if(stroke->brush->flag & BRUSH_SMOOTH_STROKE && stroke->brush->sculpt_tool != SCULPT_TOOL_GRAB) {
+	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)) {
 		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;
 
@@ -831,7 +832,7 @@
 {
 	return (br->flag & BRUSH_SPACE) &&
 	       !(br->flag & BRUSH_ANCHORED) &&
-	       !ELEM5(br->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_THUMB, SCULPT_TOOL_ROTATE, SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_SMOOTH);
+	       !ELEM4(br->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_THUMB, SCULPT_TOOL_ROTATE, SCULPT_TOOL_SNAKE_HOOK);
 }
 
 /* For brushes with stroke spacing enabled, moves mouse in steps