diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-11 14:11:32 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-11 14:11:32 +0300 |
commit | 5f5814f45fc91fad2b45e28fdc7d7566a3e5d0fd (patch) | |
tree | 0701b9df7d34ac620e74fcf465c91e61f391c4d5 /source | |
parent | b4b636386faac383b7366eedfea0017bb106cae4 (diff) |
- ignore calls to WM_cursor_wait() in background mode (crashes saving blend files)
- rename curve enum value align CENTRAL to CENTER
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_cursors.c | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index ccb032cd1c6..aaf322ee12c 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -847,7 +847,7 @@ static void rna_def_font(BlenderRNA *brna, StructRNA *srna) 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"}, diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 43352f4efd2..8998c9624e5 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -155,14 +155,16 @@ void WM_cursor_restore(wmWindow *win) /* 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); + } } } } |