[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33963] trunk/blender/source/blender/ editors/render/render_opengl.c: reverting part of Ton's commit r33911.

[Campbell Barton]

Revision: 33963
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33963
Author:   campbellbarton
Date:     2010-12-31 05:48:56 +0100 (Fri, 31 Dec 2010)

Log Message:
-----------
reverting part of Ton's commit r33911.
The bug was 'write_still' was incorrectly being initialized to 'view_context'.

'write_still' should always write an image, so failing silently here is bad behavior.
Also, opengl render and internal render engine operator should use this option the same way.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_opengl.c

Modified: trunk/blender/source/blender/editors/render/render_opengl.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_opengl.c	2010-12-31 04:29:11 UTC (rev 33962)
+++ trunk/blender/source/blender/editors/render/render_opengl.c	2010-12-31 04:48:56 UTC (rev 33963)
@@ -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, "write_still");
 
 	/* 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_WARNING, "Can't write a single file with an animation format selected.");
-		is_write_still= 0;
+		BKE_report(op->reports, RPT_ERROR, "Can't write a single file with an animation format selected.");
+		return 0;
 	}
 
 	/* stop all running jobs, currently previews frustrate Render */