[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33595] trunk/blender/source/blender: - ignore calls to WM_cursor_wait() in background mode ( crashes saving blend files)

[Campbell Barton]

Revision: 33595
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33595
Author:   campbellbarton
Date:     2010-12-11 12:11:32 +0100 (Sat, 11 Dec 2010)

Log Message:
-----------
- ignore calls to WM_cursor_wait() in background mode (crashes saving blend files)
- rename curve enum value align CENTRAL to CENTER

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_curve.c
    trunk/blender/source/blender/windowmanager/intern/wm_cursors.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c	2010-12-11 00:04:01 UTC (rev 33594)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c	2010-12-11 11:11:32 UTC (rev 33595)
@@ -847,7 +847,7 @@
 	
 	static EnumPropertyItem prop_align_items[] = {
 		{CU_LEFT, "LEFT", 0, "Left", "Align text to the left"},
-		{CU_MIDDLE, "CENTRAL", 0, "Center", "Center text"},
+		{CU_MIDDLE, "CENTER", 0, "Center", "Center text"},
 		{CU_RIGHT, "RIGHT", 0, "Right", "Align text to the right"},
 		{CU_JUSTIFY, "JUSTIFY", 0, "Justify", "Align to the left and the right"},
 		{CU_FLUSH, "FLUSH", 0, "Flush", "Align to the left and the right, with equal character spacing"},

Modified: trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_cursors.c	2010-12-11 00:04:01 UTC (rev 33594)
+++ trunk/blender/source/blender/windowmanager/intern/wm_cursors.c	2010-12-11 11:11:32 UTC (rev 33595)
@@ -155,14 +155,16 @@
 /* to allow usage all over, we do entire WM */
 void WM_cursor_wait(int val)
 {
-	wmWindowManager *wm= G.main->wm.first;
-	wmWindow *win= wm?wm->windows.first:NULL; 
-	
-	for(; win; win= win->next) {
-		if(val) {
-			WM_cursor_modal(win, CURSOR_WAIT);
-		} else {
-			WM_cursor_restore(win);
+	if(!G.background) {
+		wmWindowManager *wm= G.main->wm.first;
+		wmWindow *win= wm?wm->windows.first:NULL; 
+		
+		for(; win; win= win->next) {
+			if(val) {
+				WM_cursor_modal(win, CURSOR_WAIT);
+			} else {
+				WM_cursor_restore(win);
+			}
 		}
 	}
 }