[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33911] trunk/blender/source/blender: Small fixes:

[Ton Roosendaal]

Revision: 33911
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33911
Author:   ton
Date:     2010-12-27 19:54:43 +0100 (Mon, 27 Dec 2010)

Log Message:
-----------
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.)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_relations.c
    trunk/blender/source/blender/editors/render/render_opengl.c
    trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c	2010-12-27 18:53:34 UTC (rev 33910)
+++ trunk/blender/source/blender/editors/object/object_relations.c	2010-12-27 18:54:43 UTC (rev 33911)
@@ -655,9 +655,11 @@
 						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);

Modified: trunk/blender/source/blender/editors/render/render_opengl.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_opengl.c	2010-12-27 18:53:34 UTC (rev 33910)
+++ trunk/blender/source/blender/editors/render/render_opengl.c	2010-12-27 18:54:43 UTC (rev 33911)
@@ -223,8 +223,8 @@
 	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 @@
 	}
 
 	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 */

Modified: trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_cursors.c	2010-12-27 18:53:34 UTC (rev 33910)
+++ trunk/blender/source/blender/windowmanager/intern/wm_cursors.c	2010-12-27 18:54:43 UTC (rev 33911)
@@ -139,10 +139,9 @@
 
 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 @@
 		
 		for(; win; win= win->next) {
 			if(val) {
-				WM_cursor_modal(win, CURSOR_WAIT);
+				WM_cursor_modal(win, BC_WAITCURSOR);
 			} else {
 				WM_cursor_restore(win);
 			}

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-12-27 18:53:34 UTC (rev 33910)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-12-27 18:54:43 UTC (rev 33911)
@@ -630,9 +630,6 @@
 
 	/* 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 @@
 	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);