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
path: root/intern
diff options
context:
space:
mode:
authorRobert Guetzkow <gitcommit@outlook.de>2020-11-05 23:35:27 +0300
committerRobert Guetzkow <gitcommit@outlook.de>2020-11-05 23:35:27 +0300
commit69e567cfe85c5c6def1f2d3d72016a7e76281418 (patch)
treef6af6e2a6e37287d8efa507acab4cc0732f02c3b /intern
parent74188e65028d268af887ab2140e4253087410c1e (diff)
parent7fed420877bd22a0f0745353ba6a992d6c05a6f4 (diff)
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/render/graph.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index 1de48aa8b0d..4adfebf80ae 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) {