[Bf-blender-cvs] [738f4fbc5e3] master: Revert "Fix T92636: Vector math node link disconnects when loading old file"

[Hans Goudey]

Commit: 738f4fbc5e3af84543e07557b3b7b8120ecf9638
Author: Hans Goudey
Date:   Fri Nov 12 17:14:27 2021 -0600
Branches: master
https://developer.blender.org/rB738f4fbc5e3af84543e07557b3b7b8120ecf9638

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

This reverts commit 6b4ca781085fecc1058566a3b51bd3536eb9d4a1.

A simpler fix was used for 3.0, but rBd845ba481c6d2ef already contained
a more complete solution to the problem of inconsistent socket ids.

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

M	source/blender/blenloader/intern/versioning_300.c

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

diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index f963babc018..5296a0b4f82 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -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;
   }
 }