[Bf-blender-cvs] [b053312bdd9] blender-v2.91-release: Fix T80043: missing Cycles displacement update when relinking output sockets

Brecht Van Lommel noreply at git.blender.org
Thu Nov 5 19:36:35 CET 2020


Commit: b053312bdd974d2014e71fd6c31c250962c0ae36
Author: Brecht Van Lommel
Date:   Thu Nov 5 19:17:18 2020 +0100
Branches: blender-v2.91-release
https://developer.blender.org/rBb053312bdd974d2014e71fd6c31c250962c0ae36

Fix T80043: missing Cycles displacement update when relinking output sockets

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

M	intern/cycles/render/graph.cpp

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

diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index 485d6167ee3..088fda00abb 100644
--- a/intern/cycles/render/graph.cpp
+++ b/intern/cycles/render/graph.cpp
@@ -762,6 +762,7 @@ void ShaderGraph::compute_displacement_hash()
     foreach (ShaderInput *input, node->inputs) {
       int link_id = (input->link) ? input->link->parent->id : 0;
       md5.append((uint8_t *)&link_id, sizeof(link_id));
+      md5.append((input->link) ? input->link->name().c_str() : "");
     }
 
     if (node->special_type == SHADER_SPECIAL_TYPE_OSL) {



More information about the Bf-blender-cvs mailing list