Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.91-release'

Browse Source
This commit is contained in:
Robert Guetzkow
2020-11-05 21:35:27 +01:00
parent 74188e6502 7fed420877
commit 69e567cfe8
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/render/graph.cpp
View File

@@ -762,6 +762,7 @@ void ShaderGraph::compute_displacement_hash()
foreach (ShaderInput *input, node->inputs) { foreach (ShaderInput *input, node->inputs) {
int link_id = (input->link) ? input->link->parent->id : 0; int link_id = (input->link) ? input->link->parent->id : 0;
md5.append((uint8_t *)&link_id, sizeof(link_id)); 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) { if (node->special_type == SHADER_SPECIAL_TYPE_OSL) {

2
source/blender/editors/transform/transform.c
View File

@@ -684,7 +684,7 @@ wmKeyMap *transform_modal_keymap(wmKeyConfig *keyconf)
{TFM_MODAL_ROTATE, "ROTATE", 0, "Rotate", ""}, {TFM_MODAL_ROTATE, "ROTATE", 0, "Rotate", ""},
{TFM_MODAL_RESIZE, "RESIZE", 0, "Resize", ""}, {TFM_MODAL_RESIZE, "RESIZE", 0, "Resize", ""},
{TFM_MODAL_AUTOCONSTRAINT, "AUTOCONSTRAIN", 0, "Automatic Constraint", ""}, {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}, {0, NULL, 0, NULL, NULL},
}; };