[Bf-blender-cvs] [0775e73] master: Fix T37947: large cursors now also work on linux/mac for the edit mode cross.

Brecht Van Lommel noreply at git.blender.org
Tue Dec 31 02:01:24 CET 2013


Commit: 0775e739b7f6a990550f8498b8de3655286ae051
Author: Brecht Van Lommel
Date:   Tue Dec 31 02:00:21 2013 +0100
https://developer.blender.org/rB0775e739b7f6a990550f8498b8de3655286ae051

Fix T37947: large cursors now also work on linux/mac for the edit mode cross.

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

M	source/blender/windowmanager/intern/wm_cursors.c

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

diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c
index 9b30855..e6fc2cf 100644
--- a/source/blender/windowmanager/intern/wm_cursors.c
+++ b/source/blender/windowmanager/intern/wm_cursors.c
@@ -122,6 +122,11 @@ void WM_cursor_set(wmWindow *win, int curs)
 	 * only 1 pixel thick, use another one instead */
 	if (curs == CURSOR_EDIT)
 		curs = BC_CROSSCURSOR;
+#else
+	/* in case of large cursor, also use custom cursor because
+	 * large cursors don't work for system cursors */
+	if (U.curssize && curs == CURSOR_EDIT)
+		curs = BC_CROSSCURSOR;
 #endif
 
 	GHOST_SetCursorVisibility(win->ghostwin, 1);




More information about the Bf-blender-cvs mailing list