diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-20 15:42:26 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-20 16:03:14 +0300 |
| commit | 1613c994b069ddab170dd5af9b8f23a31541dec3 (patch) | |
| tree | 9016b299c9ba808d3bb6cd7defc466275a963461 /intern/cycles/render/svm.cpp | |
| parent | bb692a2d0f78cc5702aee9fceda4fa500ec5d7e8 (diff) | |
Fix Cycles not correctly using Background.shader if specified
Based on patch by Alex Fuller.
Differential Revision: https://developer.blender.org/D6627
Diffstat (limited to 'intern/cycles/render/svm.cpp')
| -rw-r--r-- | intern/cycles/render/svm.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp index f42a2ea818d..7c33f6c04ae 100644 --- a/intern/cycles/render/svm.cpp +++ b/intern/cycles/render/svm.cpp @@ -15,6 +15,8 @@ */ #include "device/device.h" + +#include "render/background.h" #include "render/graph.h" #include "render/light.h" #include "render/mesh.h" @@ -58,7 +60,7 @@ void SVMShaderManager::device_update_shader(Scene *scene, SVMCompiler::Summary summary; SVMCompiler compiler(scene); - compiler.background = (shader == scene->default_background); + compiler.background = (shader == scene->background->get_shader(scene)); compiler.compile(shader, *svm_nodes, 0, &summary); VLOG(2) << "Compilation summary:\n" |