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/background.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/background.cpp')
| -rw-r--r-- | intern/cycles/render/background.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/intern/cycles/render/background.cpp b/intern/cycles/render/background.cpp index b32cc55903d..6553ca735e4 100644 --- a/intern/cycles/render/background.cpp +++ b/intern/cycles/render/background.cpp @@ -64,14 +64,7 @@ void Background::device_update(Device *device, DeviceScene *dscene, Scene *scene device_free(device, dscene); - Shader *bg_shader = shader; - - if (use_shader) { - if (!bg_shader) - bg_shader = scene->default_background; - } - else - bg_shader = scene->default_empty; + Shader *bg_shader = get_shader(scene); /* set shader index and transparent option */ KernelBackground *kbackground = &dscene->data.background; @@ -134,4 +127,9 @@ void Background::tag_update(Scene *scene) need_update = true; } +Shader *Background::get_shader(const Scene *scene) +{ + return (use_shader) ? ((shader) ? shader : scene->default_background) : scene->default_empty; +} + CCL_NAMESPACE_END |