diff options
author | Hans Goudey <h.goudey@me.com> | 2021-11-13 02:12:39 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-11-13 02:12:39 +0300 |
commit | ebb4aba325e61df717a3aaf7cee34ae957806f7a (patch) | |
tree | 537aae7a58ffdbaadf146ad2141ce3ed047eb055 /source | |
parent | ec432ae998e0f6ea644866a0a8fcda861b5e6459 (diff) | |
parent | 6b4ca781085fecc1058566a3b51bd3536eb9d4a1 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index 5296a0b4f82..f963babc018 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -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; } } |