diff options
Diffstat (limited to 'intern/cycles/blender/addon/__init__.py')
| -rw-r--r-- | intern/cycles/blender/addon/__init__.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index 36fb5c0418d..16cfdca8977 100644 --- a/intern/cycles/blender/addon/__init__.py +++ b/intern/cycles/blender/addon/__init__.py @@ -39,6 +39,7 @@ class CyclesRender(bpy.types.RenderEngine): bl_idname = 'CYCLES' bl_label = "Cycles Render" bl_use_shading_nodes = True + bl_use_preview = True def __init__(self): self.session = None @@ -48,23 +49,23 @@ class CyclesRender(bpy.types.RenderEngine): # final render def update(self, data, scene): - if not self.session: - engine.create(self, data, scene) + if self.is_preview: + if not self.session: + use_osl = bpy.context.scene.cycles.shading_system + + engine.create(self, data, scene, + None, None, None, use_osl) else: - engine.reset(self, data, scene) + if not self.session: + engine.create(self, data, scene) + else: + engine.reset(self, data, scene) engine.update(self, data, scene) def render(self, scene): engine.render(self) - # preview render - # def preview_update(self, context, id): - # pass - # - # def preview_render(self): - # pass - # viewport render def view_update(self, context): if not self.session: |