sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Small fixes:

Browse Source 
- 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.)
This commit is contained in:
Ton Roosendaal 2010-12-27 18:54:43 +00:00
parent 595525067e
commit 1a8cc0a8f0
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/object/object_relations.c
View File

@ -655,9 +655,11 @@ static int parent_set_exec(bContext *C, wmOperator *op)
create_vgroups_from_armature(op->reports, scene, ob, par, ARM_GROUPS_NAME, 0);
else if(partype == PAR_ARMATURE_ENVELOPE)
create_vgroups_from_armature(op->reports, scene, ob, par, ARM_GROUPS_ENVELOPE, 0);
else if(partype == PAR_ARMATURE_AUTO)
else if(partype == PAR_ARMATURE_AUTO) {
WM_cursor_wait(1);
create_vgroups_from_armature(op->reports, scene, ob, par, ARM_GROUPS_AUTO, 0);
WM_cursor_wait(0);
}
/* get corrected inverse */
ob->partype= PAROBJECT;
what_does_parent(scene, ob, &workob);

6
source/blender/editors/render/render_opengl.c
View File

@ -223,8 +223,8 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
OGLRender *oglrender;
int sizex, sizey;
short is_view_context= RNA_boolean_get(op->ptr, "view_context");
short is_write_still= is_view_context;
const short is_animation= RNA_boolean_get(op->ptr, "animation");
const short is_write_still= RNA_boolean_get(op->ptr, "view_context");
/* ensure we have a 3d view */
@ -243,8 +243,8 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
}
if(!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.imtype)) {
BKE_report(op->reports, RPT_ERROR, "Can't write a single file with an animation format selected.");
return 0;
BKE_report(op->reports, RPT_WARNING, "Can't write a single file with an animation format selected.");
is_write_still= 0;
}
/* stop all running jobs, currently previews frustrate Render */

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

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

6
source/blender/windowmanager/intern/wm_files.c
View File

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