[Bf-blender-cvs] [27c8d869714] temp-vert-normals-cleanup: Merge branch 'master' into temp-vert-normals-cleanup

[Hans Goudey]

Commit: 27c8d869714ba2267c133710ef47cc2fbca79326
Author: Hans Goudey
Date:   Fri Nov 12 17:18:28 2021 -0600
Branches: temp-vert-normals-cleanup
https://developer.blender.org/rB27c8d869714ba2267c133710ef47cc2fbca79326

Merge branch 'master' into temp-vert-normals-cleanup

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index e0327ed1bd1,5296a0b4f82..3a2b204d59f
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -2162,10 -2171,12 +2173,17 @@@ void blo_do_versions_300(FileData *fd, 
     */
    {
      /* Keep this block, even when empty. */
 +    if (!DNA_struct_elem_find(fd->filesdna, "MVert", "short *", "no")) {
 +      LISTBASE_FOREACH (Mesh *, mesh, &bmain->meshes) {
 +        BKE_mesh_normals_tag_dirty(mesh);
 +      }
 +    }
+ 
+     FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+       if (ntree->type != NTREE_CUSTOM) {
+         version_node_tree_socket_id_delim(ntree);
+       }
+     }
+     FOREACH_NODETREE_END;
    }
  }