Merge branch 'blender-v2.91-release'
This commit is contained in:
commit
69e567cfe8
@ -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) {
|
||||
|
@ -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},
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user