archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix: Incorrect socket identifier versioning

Browse Source 
There were two issues:
 - The third math node socket does not exist in old enough files.
 - The comment incorrectly referred to the vector math node.

Differential Revision: https://developer.blender.org/D13219
This commit is contained in:
Jacques Lucke
2021-11-15 08:52:58 -06:00
committed by Hans Goudey
parent a5c59fb90e
commit 62da41d63d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2158,8 +2158,8 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
* \note Keep this message at the bottom of the function.
*/
{
/* Use consistent socket identifiers for the vector math node.
* Thecode to make unique identifiers from the names was inconsitent. */
/* Use consistent socket identifiers for the math node.
* The code to make unique identifiers from the names was inconsistent. */
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
if (ELEM(ntree->type, NTREE_SHADER, NTREE_GEOMETRY)) {
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
@@ -2167,7 +2167,11 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
bNodeSocket *value1 = ((bNodeSocket *)node->inputs.first)->next;
bNodeSocket *value2 = value1->next;
strcpy(value1->identifier, "Value_001");
strcpy(value2->identifier, "Value_002");
if (value2 != NULL) {
/* This can be null when file is quite old so that the socket did not exist
* (before 0406eb110332a8). */
strcpy(value2->identifier, "Value_002");
}
}
}
}