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/background.h
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/background.h')
-rw-r--r--intern/cycles/render/background.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/render/background.h b/intern/cycles/render/background.h
index 020db7bf6aa..fb27430f9a3 100644
--- a/intern/cycles/render/background.h
+++ b/intern/cycles/render/background.h
@@ -55,6 +55,8 @@ class Background : public Node {
bool modified(const Background &background);
void tag_update(Scene *scene);
+
+ Shader *get_shader(const Scene *scene);
};
CCL_NAMESPACE_END