Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Mours <pmours@nvidia.com>2022-11-09 16:25:32 +0300
committerPatrick Mours <pmours@nvidia.com>2022-11-09 17:30:21 +0300
commite6b38deb9dbb58118f6ee644409ce52f06eac5e5 (patch)
treeaa1c384db146094482f24c94f704742c6624db00 /intern/cycles/blender/addon/__init__.py
parentefe073f57c34b438d21750795e97458a3d007be7 (diff)
Cycles: Add basic support for using OSL with OptiX
This patch generalizes the OSL support in Cycles to include GPU device types and adds an implementation for that in the OptiX device. There are some caveats still, including simplified texturing due to lack of OIIO on the GPU and a few missing OSL intrinsics. Note that this is incomplete and missing an update to the OSL library before being enabled! The implementation is already committed now to simplify further development. Maniphest Tasks: T101222 Differential Revision: https://developer.blender.org/D15902
Diffstat (limited to 'intern/cycles/blender/addon/__init__.py')
-rw-r--r--intern/cycles/blender/addon/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index 05f27bdbd4d..354c9c23a53 100644
--- a/intern/cycles/blender/addon/__init__.py
+++ b/intern/cycles/blender/addon/__init__.py
@@ -58,7 +58,7 @@ class CyclesRender(bpy.types.RenderEngine):
if not self.session:
if self.is_preview:
cscene = bpy.context.scene.cycles
- use_osl = cscene.shading_system and cscene.device == 'CPU'
+ use_osl = cscene.shading_system
engine.create(self, data, preview_osl=use_osl)
else: