diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-31 07:48:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-31 07:48:56 +0300 |
| commit | ae51e1c683358fffd8197538085efd7d161c09f9 (patch) | |
| tree | 8be08cc64159ad8bdca866764d9349bad3c059a5 /source/blender/editors/render/render_opengl.c | |
| parent | 6fdfa97edba9bd05d7c4d5e0cfe0bb81a99f5701 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/render/render_opengl.c')
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index b9904eb1a98..df5576c778d 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -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, "write_still"); /* 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_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 */ |