diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-12-27 21:54:43 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-12-27 21:54:43 +0300 |
| commit | 1a8cc0a8f051c92e03bee4ad9cb4ae0727b0a4e5 (patch) | |
| tree | 1639852ec8b79dad83ef86045dd3a63f126c75eb /source/blender/windowmanager | |
| parent | 595525067e9138441fe841edfbda7100ac560624 (diff) | |
Small fixes:
- OpenGL still render failed when output format was set to Movie.
Now it just doesn't save a file and renders anyway.
- Bone heat weight was missing 'wait cursor'.
- Waitcursor for Mac Cocoa is back! Made all OS's use the same
nice hourglass cursor.
(Note: this violates Mac UI guidelines, we should rely on the
spinning wheel of death instead. Highly disputable that.)
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_cursors.c | 7 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 8998c9624e5..6034ddce1b5 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -139,10 +139,9 @@ void WM_cursor_set(wmWindow *win, int curs) void WM_cursor_modal(wmWindow *win, int val) { - if(win->lastcursor == 0) { + if(win->lastcursor == 0) win->lastcursor = win->cursor; - WM_cursor_set(win, val); - } + WM_cursor_set(win, val); } void WM_cursor_restore(wmWindow *win) @@ -161,7 +160,7 @@ void WM_cursor_wait(int val) for(; win; win= win->next) { if(val) { - WM_cursor_modal(win, CURSOR_WAIT); + WM_cursor_modal(win, BC_WAITCURSOR); } else { WM_cursor_restore(win); } diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 006f96502c6..5938f661ca8 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -630,9 +630,6 @@ int WM_write_file(bContext *C, const char *target, int fileflags, ReportList *re /* operator now handles overwrite checks */ - /* don't forget not to return without! */ - WM_cursor_wait(1); - if (G.fileflags & G_AUTOPACK) { packAll(G.main, reports); } @@ -640,6 +637,9 @@ int WM_write_file(bContext *C, const char *target, int fileflags, ReportList *re ED_object_exit_editmode(C, EM_DO_UNDO); ED_sculpt_force_update(C); + /* don't forget not to return without! */ + WM_cursor_wait(1); + /* blend file thumbnail */ ibuf_thumb= blend_file_thumb(CTX_data_scene(C), &thumb); |