diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-03-11 19:49:00 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-11 22:35:38 +0300 |
| commit | ec3eeee46b4885b9167b0dc28d273993d77b8ce6 (patch) | |
| tree | 9177fb4e62877f7cef35c528f10a0881db6f1316 /intern/cycles/render/scene.cpp | |
| parent | 5a169ae2f327f366137b6cefd2da75287f761a4f (diff) | |
Cycles: add internal default volume shader, to be used for new volume object
This is mostly straightforward, but required some refactoring to ensure that
the default volume material does not always turn on the volume feature for GPU
rendering.
Diffstat (limited to 'intern/cycles/render/scene.cpp')
| -rw-r--r-- | intern/cycles/render/scene.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index 7fab2fdedeb..1e20513e88a 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -104,9 +104,11 @@ Scene::Scene(const SceneParams ¶ms_, Device *device) /* OSL only works on the CPU */ if (device->info.has_osl) - shader_manager = ShaderManager::create(this, params.shadingsystem); + shader_manager = ShaderManager::create(params.shadingsystem); else - shader_manager = ShaderManager::create(this, SHADINGSYSTEM_SVM); + shader_manager = ShaderManager::create(SHADINGSYSTEM_SVM); + + shader_manager->add_default(this); } Scene::~Scene() |