Commit: a02a97753b74b96971a94c9c979ea122c26a2870
Author: Brecht Van Lommel
Date: Mon Jan 13 23:29:35 2014 +0100
https://developer.blender.org/rBa02a97753b74b96971a94c9c979ea122c26a2870
Fix T38192: OSL got incorrectly enabled in preview render when GPU was selected
for rendering of the main scene.
===================================================================
M intern/cycles/blender/addon/__init__.py
===================================================================
diff --git a/intern/cycles/blender/addon/__init__.py
b/intern/cycles/blender/addon/__init__.py
index e54db53..afd2694 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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
