diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-14 02:29:35 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-14 02:29:35 +0400 |
| commit | a02a97753b74b96971a94c9c979ea122c26a2870 (patch) | |
| tree | e997d5acf4ba034b9a4a6b20d954dbc173723cde /intern/cycles/blender/addon/__init__.py | |
| parent | 6eedf08cca01965eecf15fccbc08a5db6a23b5aa (diff) | |
Fix T38192: OSL got incorrectly enabled in preview render when GPU was selected
for rendering of the main scene.
Diffstat (limited to 'intern/cycles/blender/addon/__init__.py')
| -rw-r--r-- | intern/cycles/blender/addon/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index e54db53c595..afd26945d6c 100644 --- a/intern/cycles/blender/addon/__init__.py +++ b/intern/cycles/blender/addon/__init__.py @@ -51,7 +51,8 @@ class CyclesRender(bpy.types.RenderEngine): def update(self, data, scene): if self.is_preview: if not self.session: - use_osl = bpy.context.scene.cycles.shading_system + cscene = bpy.context.scene.cycles + use_osl = cscene.shading_system and cscene.device == 'CPU' engine.create(self, data, scene, None, None, None, use_osl) |