blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Hans Goudey 2021-11-12 17:12:39 -06:00
parent ec432ae998 6b4ca78108
commit ebb4aba325
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenloader/intern/versioning_300.c
View File

@ -2178,5 +2178,21 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
FOREACH_NODETREE_END;
/* Use consistent socket identifiers for the vector math node.
* Thecode to make unique identifiers from the names was inconsitent. */
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
if (ELEM(ntree->type, NTREE_SHADER, NTREE_GEOMETRY)) {
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
if (node->type == SH_NODE_MATH) {
bNodeSocket *value1 = ((bNodeSocket *)node->inputs.first)->next;
bNodeSocket *value2 = value1->next;
strcpy(value1->identifier, "Value_001");
strcpy(value2->identifier, "Value_002");
}
}
}
}
FOREACH_NODETREE_END;
}
}