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/editors/render | |
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/editors/render')
-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 11a4f8a3bbf..b9904eb1a98 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, "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 */ |