[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55158] trunk/blender/source/blender/ editors/sculpt_paint/paint_stroke.c: Fix #34562, leftover from own coordinate conversion refactoring.

Antony Riakiotakis kalast at gmail.com
Sun Mar 10 12:37:27 CET 2013


Revision: 55158
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55158
Author:   psy-fi
Date:     2013-03-10 11:37:27 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
Fix #34562, leftover from own coordinate conversion refactoring. Also
avoid extraneous OpenGL state chage.

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

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c	2013-03-10 11:30:21 UTC (rev 55157)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c	2013-03-10 11:37:27 UTC (rev 55158)
@@ -104,18 +104,16 @@
 	Brush *brush = paint_brush(paint);
 	PaintStroke *stroke = customdata;
 
-	glColor4ubv(paint->paint_cursor_col);
-	glEnable(GL_LINE_SMOOTH);
-	glEnable(GL_BLEND);
-
 	if (stroke && brush && (brush->flag & BRUSH_SMOOTH_STROKE)) {
-		ARegion *ar = CTX_wm_region(C);
-		sdrawline(x, y, (int)stroke->last_mouse_position[0] - ar->winrct.xmin,
-		          (int)stroke->last_mouse_position[1] - ar->winrct.ymin);
-	}
+		glColor4ubv(paint->paint_cursor_col);
+		glEnable(GL_LINE_SMOOTH);
+		glEnable(GL_BLEND);
 
-	glDisable(GL_BLEND);
-	glDisable(GL_LINE_SMOOTH);
+		sdrawline(x, y, (int)stroke->last_mouse_position[0],
+		          (int)stroke->last_mouse_position[1]);
+		glDisable(GL_BLEND);
+		glDisable(GL_LINE_SMOOTH);
+	}
 }
 
 /* if this is a tablet event, return tablet pressure and set *pen_flip




More information about the Bf-blender-cvs mailing list