[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29047] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint/sculpt.c: Brush strength should not be reduced if brush spacing is not enabled.

[Jason Wilkins]

Revision: 29047
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29047
Author:   jwilkins
Date:     2010-05-28 18:11:55 +0200 (Fri, 28 May 2010)

Log Message:
-----------
Brush strength should not be reduced if brush spacing is not enabled.

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

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-05-28 14:45:16 UTC (rev 29046)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-05-28 16:11:55 UTC (rev 29047)
@@ -598,7 +598,7 @@
     float dir      = brush->flag & BRUSH_DIR_IN ? -1 : 1;
     float pressure = brush->flag & BRUSH_ALPHA_PRESSURE ? cache->pressure : 1;
     float flip     = cache->flip ? -1 : 1;
-    float overlap  = brush->spacing < 100.0f ? 1 - circle_overlap_percent(brush->spacing/50.0f) : 1; // spacing is integer percentage of radius, divide by 50 to get normalized diameter
+    float overlap  = (brush->flag & BRUSH_SPACE) && (brush->spacing < 100.0f) ? 1 - circle_overlap_percent(brush->spacing/50.0f) : 1; // spacing is integer percentage of radius, divide by 50 to get normalized diameter
 
     switch(brush->sculpt_tool){
         case SCULPT_TOOL_DRAW: