diff options
author | Sebastian Parborg <darkdefende@gmail.com> | 2022-02-17 20:44:18 +0300 |
---|---|---|
committer | Sebastian Parborg <darkdefende@gmail.com> | 2022-02-17 20:44:18 +0300 |
commit | b6fe1b0c658f5068154f9e4a726de789f5ebb68a (patch) | |
tree | 6cd2450b64a4310488137fb093840e28723d2667 /intern/cycles | |
parent | 8355ac97b4327acde8b656e38e5f4911918ef521 (diff) | |
parent | a04300c436d77bf47b94d033c1d832d86425945c (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/blender/shader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/shader.cpp b/intern/cycles/blender/shader.cpp index 9de507966d8..9d696aaeeb2 100644 --- a/intern/cycles/blender/shader.cpp +++ b/intern/cycles/blender/shader.cpp @@ -32,7 +32,8 @@ typedef map<string, ConvertNode *> ProxyMap; void BlenderSync::find_shader(BL::ID &id, array<Node *> &used_shaders, Shader *default_shader) { - Shader *shader = (id) ? shader_map.find(id) : default_shader; + Shader *synced_shader = (id) ? shader_map.find(id) : nullptr; + Shader *shader = (synced_shader) ? synced_shader : default_shader; used_shaders.push_back_slow(shader); shader->tag_used(scene); |