[Bf-blender-cvs] [26dc8b7] master: T41354, cursor never gets reactivated in uv sculpting.

Antony Riakiotakis noreply at git.blender.org
Thu Aug 7 16:14:42 CEST 2014


Commit: 26dc8b7c18c88ae7604745eb02800424b7dd5a6c
Author: Antony Riakiotakis
Date:   Thu Aug 7 16:14:33 2014 +0200
Branches: master
https://developer.blender.org/rB26dc8b7c18c88ae7604745eb02800424b7dd5a6c

T41354, cursor never gets reactivated in uv sculpting.

===================================================================

M	source/blender/editors/sculpt_paint/sculpt_uv.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c
index 797a881..292d623 100644
--- a/source/blender/editors/sculpt_paint/sculpt_uv.c
+++ b/source/blender/editors/sculpt_paint/sculpt_uv.c
@@ -239,12 +239,14 @@ void ED_space_image_uv_sculpt_update(wmWindowManager *wm, ToolSettings *settings
 
 		BKE_paint_init(&settings->uvsculpt->paint, PAINT_CURSOR_SCULPT);
 
-		WM_paint_cursor_activate(wm, uv_sculpt_brush_poll,
-		                         brush_drawcursor_uvsculpt, NULL);
+		settings->uvsculpt->paint.paint_cursor = WM_paint_cursor_activate(wm, uv_sculpt_brush_poll,
+		                                                                  brush_drawcursor_uvsculpt, NULL);
 	}
 	else {
-		if (settings->uvsculpt)
-			settings->uvsculpt->paint.flags &= ~PAINT_SHOW_BRUSH;
+		if (settings->uvsculpt) {
+			WM_paint_cursor_end(wm, settings->uvsculpt->paint.paint_cursor);
+			settings->uvsculpt->paint.paint_cursor = NULL;
+		}
 	}
 }




More information about the Bf-blender-cvs mailing list