diff options
| author | Martijn Versteegh <blender@aaltjegron.nl> | 2022-11-11 21:44:16 +0300 |
|---|---|---|
| committer | Martijn Versteegh <blender@aaltjegron.nl> | 2022-11-11 21:44:16 +0300 |
| commit | b4757873bf1c2fb5e3f858a085af62359d3c1b3f (patch) | |
| tree | 98d4407723ef2816334d06cd79388c0d7b2d708c /intern/cycles/scene/scene.cpp | |
| parent | 62effd6791858221392ff7b92104a22ed44ebf7d (diff) | |
| parent | 2c596319a4888aa40bfdf41f9ea5d446179141d0 (diff) | |
Merge branch 'master' into refactor-mesh-uv-map-generic
Diffstat (limited to 'intern/cycles/scene/scene.cpp')
| -rw-r--r-- | intern/cycles/scene/scene.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/intern/cycles/scene/scene.cpp b/intern/cycles/scene/scene.cpp index 3a05bede7a3..d5be86e1db9 100644 --- a/intern/cycles/scene/scene.cpp +++ b/intern/cycles/scene/scene.cpp @@ -99,11 +99,8 @@ Scene::Scene(const SceneParams ¶ms_, Device *device) { memset((void *)&dscene.data, 0, sizeof(dscene.data)); - /* OSL only works on the CPU */ - if (device->info.has_osl) - shader_manager = ShaderManager::create(params.shadingsystem); - else - shader_manager = ShaderManager::create(SHADINGSYSTEM_SVM); + shader_manager = ShaderManager::create( + device->info.has_osl ? params.shadingsystem : SHADINGSYSTEM_SVM, device); light_manager = new LightManager(); geometry_manager = new GeometryManager(); |