sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Make it survive if preview_cycles.blend uses persistent data

Browse Source 
Currently should be no functional changes, but nice thing to have fixed
for some further experiments.
This commit is contained in:
Sergey Sharybin 2015-02-21 19:17:09 +05:00
parent 6d9c99422b
commit 63b0a7feb2
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/blender/addon/__init__.py
View File

@ -50,21 +50,18 @@ class CyclesRender(bpy.types.RenderEngine):
# final render # final render
def update(self, data, scene): 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 cscene = bpy.context.scene.cycles
use_osl = cscene.shading_system and cscene.device == 'CPU' use_osl = cscene.shading_system and cscene.device == 'CPU'
engine.create(self, data, scene, engine.create(self, data, scene,
None, None, None, use_osl) None, None, None, use_osl)
else: else:
if not self.session:
engine.create(self, data, scene) engine.create(self, data, scene)
else: else:
engine.reset(self, data, scene) engine.reset(self, data, scene)
engine.update(self, data, scene)
def render(self, scene): def render(self, scene):
engine.render(self) engine.render(self)