blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Revert "Fix T92636: Vector math node link disconnects when loading old file" 

This reverts commit 6b4ca78108.

A simpler fix was used for 3.0, but rBd845ba481c6d2ef already contained
a more complete solution to the problem of inconsistent socket ids.
This commit is contained in:
Hans Goudey 2021-11-12 17:14:27 -06:00
parent ebb4aba325
commit 738f4fbc5e
Notes: blender-bot 2023-10-13 01:54:23 +02:00 
Referenced by issue #92636, Procedural texture "Camo" not rendering correctly in 3.0.0 Beta
1 changed files with 0 additions and 16 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,21 +2178,5 @@ 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;
}
}