diff options
| -rw-r--r-- | intern/cycles/render/graph.cpp | 1 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform.c | 2 |
2 files changed, 2 insertions, 1 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) { diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 9f4777a716d..b622ef79c64 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -684,7 +684,7 @@ wmKeyMap *transform_modal_keymap(wmKeyConfig *keyconf) {TFM_MODAL_ROTATE, "ROTATE", 0, "Rotate", ""}, {TFM_MODAL_RESIZE, "RESIZE", 0, "Resize", ""}, {TFM_MODAL_AUTOCONSTRAINT, "AUTOCONSTRAIN", 0, "Automatic Constraint", ""}, - {TFM_MODAL_AUTOCONSTRAINTPLANE, "AUTOCONSTRAINPLANE", 0, "Automatic Constraint", ""}, + {TFM_MODAL_AUTOCONSTRAINTPLANE, "AUTOCONSTRAINPLANE", 0, "Automatic Constraint Plane", ""}, {0, NULL, 0, NULL, NULL}, }; |