diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-14 16:08:32 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-14 16:11:07 +0400 |
commit | 2ab9a0ff0972ce62d96aada3bf7d2de083a169b3 (patch) | |
tree | 32a557b79b892ecffc5898e50cfa2e13f5299025 /intern/cycles | |
parent | dcec99734b4ca63995e16e0cdd92b9ee1dbed787 (diff) |
Fix cycles standalone not saving renders in background mode.
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/blender/addon/__init__.py | 2 | ||||
-rw-r--r-- | intern/cycles/render/session.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index afd26945d6c..9f42cc9bb00 100644 --- a/intern/cycles/blender/addon/__init__.py +++ b/intern/cycles/blender/addon/__init__.py @@ -19,7 +19,7 @@ bl_info = { "name": "Cycles Render Engine", "author": "", - "blender": (2, 67, 0), + "blender": (2, 70, 0), "location": "Info header, render engine menu", "description": "Cycles Render Engine integration", "warning": "", diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 2b799972a97..23acc969b8a 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -50,7 +50,7 @@ Session::Session(const SessionParams& params_) device = Device::create(params.device, stats, params.background); - if(params.background) { + if(params.background && params.output_path.empty()) { buffers = NULL; display = NULL; } |