diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-02-17 19:21:06 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-02-17 19:30:40 +0300 |
commit | 9281ba5812c2f6d155649aae6142b06bf00e84f7 (patch) | |
tree | b13d882e04e67997d4fade347fc26ba8fbb68858 | |
parent | e5100ca3ad17b1b9a40ffd8a8edccb6cb553e558 (diff) |
Fix part of T95654: Cycles crash with text objects in excluded view layers
This is a bug on the Blender side, where the depsgraph does not have proper
relations for text object duplis and fails to include the required materials
in the dependency graph. But at least Cycles should not crash.
-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 39e49ac3478..418393c2be7 100644 --- a/intern/cycles/blender/shader.cpp +++ b/intern/cycles/blender/shader.cpp @@ -45,7 +45,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); |