[Bf-blender-cvs] [63b0a7f] master: Cycles: Make it survive if preview_cycles.blend uses persistent data
Sergey Sharybin
noreply at git.blender.org
Sat Feb 21 15:18:27 CET 2015
Commit: 63b0a7feb2897eaabf39422d8c08b35b19053327
Author: Sergey Sharybin
Date: Sat Feb 21 19:17:09 2015 +0500
Branches: master
https://developer.blender.org/rB63b0a7feb2897eaabf39422d8c08b35b19053327
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.
===================================================================
M intern/cycles/blender/addon/__init__.py
===================================================================
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index 64e4a83..5b0c6a8 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)
More information about the Bf-blender-cvs
mailing list