diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-13 12:28:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-13 12:28:51 +0400 |
| commit | 3bb9c4adf985aff5e8e213807f3db0d7cd7556e7 (patch) | |
| tree | 72c0633bfd67928347c78b7615397051fd8b7beb /source/blender/editors/render | |
| parent | 705f23064e8ba3e96690d163c98687fc79d4a179 (diff) | |
| parent | 80c7190373888683e3d1346eaaf52f1a92a45294 (diff) | |
svn merge ^/trunk/blender -r43338:43345
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 66f0e429b76..a3783bdb342 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -46,6 +46,7 @@ #include "DNA_object_types.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_image.h" #include "BKE_main.h" #include "BKE_report.h" @@ -258,6 +259,11 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op) const short is_write_still= RNA_boolean_get(op->ptr, "write_still"); char err_out[256]= "unknown"; + if(G.background) { + BKE_report(op->reports, RPT_ERROR, "Can't use OpenGL render in background mode (no opengl context)"); + return 0; + } + /* ensure we have a 3d view */ if(!ED_view3d_context_activate(C)) { |