archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- ignore calls to WM_cursor_wait() in background mode (crashes saving blend files)

Browse Source 
- rename curve enum value align CENTRAL to CENTER
This commit is contained in:
Campbell Barton
2010-12-11 11:11:32 +00:00
parent b4b636386f
commit 5f5814f45f
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/rna_curve.c
View File

@@ -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"},

18
source/blender/windowmanager/intern/wm_cursors.c
View File

@@ -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);
}
}
}
}