diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-21 17:17:09 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-02-21 17:18:20 +0300 |
commit | 63b0a7feb2897eaabf39422d8c08b35b19053327 (patch) | |
tree | 1ef0642d50f03327057a4472a29a7f25e790d66d /intern | |
parent | 6d9c99422b8873d6276af35d884105075077df2e (diff) |
Cycles: Make it survive if preview_cycles.blend uses persistent data
Currently should be no functional changes, but nice thing to have fixed
for some further experiments.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/__init__.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index 64e4a8391d1..5b0c6a84bb5 100644 --- a/intern/cycles/blender/addon/__init__.py +++ b/intern/cycles/blender/addon/__init__.py @@ -50,20 +50,17 @@ class CyclesRender(bpy.types.RenderEngine): # final render def update(self, data, scene): - if self.is_preview: - if not self.session: + if not self.session: + if self.is_preview: cscene = bpy.context.scene.cycles use_osl = cscene.shading_system and cscene.device == 'CPU' engine.create(self, data, scene, None, None, None, use_osl) - else: - if not self.session: - engine.create(self, data, scene) else: - engine.reset(self, data, scene) - - engine.update(self, data, scene) + engine.create(self, data, scene) + else: + engine.reset(self, data, scene) def render(self, scene): engine.render(self) |