[Bf-blender-cvs] [9281ba5812c] blender-v3.1-release: Fix part of T95654: Cycles crash with text objects in excluded view layers

[Brecht Van Lommel]

Commit: 9281ba5812c2f6d155649aae6142b06bf00e84f7
Author: Brecht Van Lommel
Date:   Thu Feb 17 17:21:06 2022 +0100
Branches: blender-v3.1-release
https://developer.blender.org/rB9281ba5812c2f6d155649aae6142b06bf00e84f7

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.

===================================================================

M	intern/cycles/blender/shader.cpp

===================================================================

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);