[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53864] trunk/blender/source/blender/ editors/sculpt_paint/paint_cursor.c: change to own commit r53852.

Campbell Barton ideasman42 at gmail.com
Thu Jan 17 00:37:47 CET 2013


Revision: 53864
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53864
Author:   campbellbarton
Date:     2013-01-16 23:37:47 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
change to own commit r53852. use existing pressure member of UnifiedPaintSettings.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53852

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

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c	2013-01-16 23:20:09 UTC (rev 53863)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c	2013-01-16 23:37:47 UTC (rev 53864)
@@ -597,15 +597,11 @@
 	glTranslatef(translation[0], translation[1], 0);
 
 	/* draw an inner brush */
-	if (BKE_brush_use_size_pressure(scene, brush)) {
-		const wmWindow *win = CTX_wm_window(C);
-		const float pressure = WM_cursor_pressure(win);
-		if (pressure != -1.0f && pressure != 0.0f) {
-			/* inner at full alpha */
-			glutil_draw_lined_arc(0.0, M_PI * 2.0, final_radius * pressure, 40);
-			/* outer at half alpha */
-			glColor4f(outline_col[0], outline_col[1], outline_col[2], outline_alpha * 0.5f);
-		}
+	if (ups->draw_pressure) {
+		/* inner at full alpha */
+		glutil_draw_lined_arc(0.0, M_PI * 2.0, final_radius * ups->pressure_value, 40);
+		/* outer at half alpha */
+		glColor4f(outline_col[0], outline_col[1], outline_col[2], outline_alpha * 0.5f);
 	}
 	glutil_draw_lined_arc(0.0, M_PI * 2.0, final_radius, 40);
 	glTranslatef(-translation[0], -translation[1], 0);




More information about the Bf-blender-cvs mailing list