[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30737] trunk/blender/source/blender/ editors/sculpt_paint/paint_image.c: * Accessing Brush size, alpha, size pressure, alpha pressure, and unprojected radius need to use the appropriate brush_* function.

[Jason Wilkins]

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

Log Message:
-----------
* Accessing Brush size, alpha, size pressure, alpha pressure, and unprojected radius need to use the appropriate brush_* function.

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

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2010-07-26 03:33:31 UTC (rev 30736)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2010-07-26 03:43:17 UTC (rev 30737)
@@ -4830,13 +4830,13 @@
 
 		/* special exception here for too high pressure values on first touch in
 		   windows for some tablets, then we just skip first touch ..  */
-		if (tablet && (pressure >= 0.99f) && (pop->s.brush->flag & BRUSH_SPACING_PRESSURE) && brush_use_alpha_pressure(pop->s.brush) && brush_use_size_pressure(pop->s.brush))
+		if (tablet && (pressure >= 0.99f) && ((pop->s.brush->flag & BRUSH_SPACING_PRESSURE) || brush_use_alpha_pressure(pop->s.brush) || brush_use_size_pressure(pop->s.brush)))
 			return;
 
 		/* This can be removed once fixed properly in
 		 brush_painter_paint(BrushPainter *painter, BrushFunc func, float *pos, double time, float pressure, void *user) 
 		 at zero pressure we should do nothing 1/2^12 is .0002 which is the sensitivity of the most sensitive pen tablet available*/
-		if ((pop->s.brush->flag & (BRUSH_ALPHA_PRESSURE|BRUSH_SIZE_PRESSURE|BRUSH_SPACING_PRESSURE)) && tablet && (pressure <= 0.0002f))
+		if (tablet && (pressure < .0002f) && ((pop->s.brush->flag & BRUSH_SPACING_PRESSURE) || brush_use_alpha_pressure(pop->s.brush) || brush_use_size_pressure(pop->s.brush)))
 			return;
 	
 	}