[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29343] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint/paint_stroke.c: The *previous* commit was a merge with trunk:

[Jason Wilkins]

Revision: 29343
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29343
Author:   jwilkins
Date:     2010-06-08 17:30:09 +0200 (Tue, 08 Jun 2010)

Log Message:
-----------
The *previous* commit was a merge with trunk:
29259-29340

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-06-08 15:26:47 UTC (rev 29342)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_stroke.c	2010-06-08 15:30:09 UTC (rev 29343)
@@ -489,13 +489,13 @@
 		if(!(paint->flags & PAINT_SHOW_BRUSH))
 			return;
 
+		glEnable(GL_BLEND);
+
 		if ((brush->flag & BRUSH_DIR_IN) && ELEM4(brush->sculpt_tool, SCULPT_TOOL_DRAW, SCULPT_TOOL_INFLATE, SCULPT_TOOL_CLAY, SCULPT_TOOL_PINCH))
 			glColor4f(brush->sub_col[0], brush->sub_col[1], brush->sub_col[2], 0.20f + (brush->visual_strength*.7));
 		else
 			glColor4f(brush->add_col[0], brush->add_col[1], brush->add_col[2], 0.20f + (brush->visual_strength*.7));
 
-		glEnable(GL_BLEND);
-
 		if (paint->flags & PAINT_SHOW_BRUSH_ON_SURFACE) {
 			GLUquadric* sphere;
 			float anchored_offset;