[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57854] trunk/blender/source/blender: fix for crash when setting the cursor in background mode.

[Campbell Barton]

Revision: 57854
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57854
Author:   campbellbarton
Date:     2013-06-28 16:37:39 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
fix for crash when setting the cursor in background mode.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/tracking.c
    trunk/blender/source/blender/editors/space_script/script_edit.c
    trunk/blender/source/blender/windowmanager/intern/wm_cursors.c

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2013-06-28 16:30:34 UTC (rev 57853)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2013-06-28 16:37:39 UTC (rev 57854)
@@ -2901,7 +2901,7 @@
 	int message_size;
 } ReconstructProgressData;
 
-/* Create mew libmv Tracks structure from blender's tracks list. */
+/* Create new libmv Tracks structure from blender's tracks list. */
 static struct libmv_Tracks *libmv_tracks_new(ListBase *tracksbase, int width, int height)
 {
 	int tracknr = 0;

Modified: trunk/blender/source/blender/editors/space_script/script_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_script/script_edit.c	2013-06-28 16:30:34 UTC (rev 57853)
+++ trunk/blender/source/blender/editors/space_script/script_edit.c	2013-06-28 16:37:39 UTC (rev 57854)
@@ -129,7 +129,7 @@
 	WM_event_add_notifier(C, NC_WINDOW, NULL);
 	return OPERATOR_FINISHED;
 #else
-	(void)C; /* unused */
+	(void)C, (void)op; /* unused */
 	return OPERATOR_CANCELLED;
 #endif
 }

Modified: trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_cursors.c	2013-06-28 16:30:34 UTC (rev 57853)
+++ trunk/blender/source/blender/windowmanager/intern/wm_cursors.c	2013-06-28 16:37:39 UTC (rev 57854)
@@ -107,7 +107,9 @@
 void WM_cursor_set(wmWindow *win, int curs)
 {
 
-	if (win == NULL) return;  /* Can't set custom cursor before Window init */
+	if (win == NULL || G.background) {
+		return;  /* Can't set custom cursor before Window init */
+	}
 
 	if (curs == CURSOR_NONE) {
 		GHOST_SetCursorVisibility(win->ghostwin, 0);