[Bf-blender-cvs] [ebb4aba325e] master: Merge branch 'blender-v3.0-release'

[Hans Goudey]

Commit: ebb4aba325e61df717a3aaf7cee34ae957806f7a
Author: Hans Goudey
Date:   Fri Nov 12 17:12:39 2021 -0600
Branches: master
https://developer.blender.org/rBebb4aba325e61df717a3aaf7cee34ae957806f7a

Merge branch 'blender-v3.0-release'

===================================================================



===================================================================

diff --cc source/blender/blenloader/intern/versioning_300.c
index 5296a0b4f82,6402bcc0b05..f963babc018
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -2170,13 -2158,20 +2170,29 @@@ void blo_do_versions_300(FileData *fd, 
     * \note Keep this message at the bottom of the function.
     */
    {
 +    /* Keep this block, even when empty. */
 +
 +    FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
 +      if (ntree->type != NTREE_CUSTOM) {
 +        version_node_tree_socket_id_delim(ntree);
 +      }
 +    }
 +    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;
    }
  }