[Bf-blender-cvs] [a1ffbbdd3bb] cycles-x: Merge branch 'master' into cycles-x

[Sergey Sharybin]

Commit: a1ffbbdd3bbf4c5c4f5ef085af34017d57dd9149
Author: Sergey Sharybin
Date:   Mon Aug 23 11:47:12 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBa1ffbbdd3bbf4c5c4f5ef085af34017d57dd9149

Merge branch 'master' into cycles-x

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 848d7380b52,eb01bfbfb9c..3e807069b72
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -802,14 -788,22 +802,32 @@@ void blo_do_versions_300(FileData *fd, 
    {
      /* Keep this block, even when empty. */
  
+     /* Add node storage for subdivision surface node. */
+     FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+       if (ntree->type == NTREE_GEOMETRY) {
+         LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
+           if (node->type == GEO_NODE_SUBDIVISION_SURFACE) {
+             if (node->storage == NULL) {
+               NodeGeometrySubdivisionSurface *data = MEM_callocN(
+                   sizeof(NodeGeometrySubdivisionSurface), __func__);
+               data->uv_smooth = SUBSURF_UV_SMOOTH_PRESERVE_BOUNDARIES;
+               data->boundary_smooth = SUBSURF_BOUNDARY_SMOOTH_ALL;
+               node->storage = data;
+             }
+           }
+         }
+       }
+     }
+     FOREACH_NODETREE_END;
++
 +    /* TODO: move to specific subversion when merging into master. */
 +    FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
 +      if (ntree->type == NTREE_SHADER) {
 +        LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
 +          do_version_subsurface_methods(node);
 +        }
 +      }
 +    }
 +    FOREACH_NODETREE_END;
    }
  }