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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2020-01-20 15:42:26 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-01-20 16:03:14 +0300
commit1613c994b069ddab170dd5af9b8f23a31541dec3 (patch)
tree9016b299c9ba808d3bb6cd7defc466275a963461 /intern/cycles/render/shader.cpp
parentbb692a2d0f78cc5702aee9fceda4fa500ec5d7e8 (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/shader.cpp')
-rw-r--r--intern/cycles/render/shader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 3b73fa4139f..da04ef63295 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -317,7 +317,7 @@ void Shader::tag_update(Scene *scene)
* has use_mis set to false. We are quite close to release now, so
* better to be safe.
*/
- if (this == scene->default_background && scene->light_manager->has_background_light(scene)) {
+ if (this == scene->background->get_shader(scene) && scene->light_manager->has_background_light(scene)) {
scene->light_manager->need_update = true;
}