[Bf-blender-cvs] [46582b37433] sculpt-dev: Merge branch 'master' into sculpt-dev

[Pablo Dobarro]

Commit: 46582b37433b7e09b4576424050688f8845dd314
Author: Pablo Dobarro
Date:   Sun Jan 24 03:04:27 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rB46582b37433b7e09b4576424050688f8845dd314

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 06f954feca1,555b2453c62..21e7b2b92d4
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1610,14 -1609,26 +1610,32 @@@ void blo_do_versions_290(FileData *fd, 
          brush->gpencil_settings->fill_factor = 1.0f;
        }
      }
 +
 +    if (!DNA_struct_elem_find(fd->filesdna, "Brush", "CurveMapping", "*pressure_size_curve")) {
 +      LISTBASE_FOREACH (Brush *, br, &bmain->brushes) {
 +        BKE_brush_default_input_curves_set(br);
 +      }
 +    }
    }
  
+   if (!MAIN_VERSION_ATLEAST(bmain, 293, 3)) {
+     FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+       if (ntree->type != NTREE_GEOMETRY) {
+         continue;
+       }
+       LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
+         if (node->type == GEO_NODE_POINT_INSTANCE && node->storage == NULL) {
+           NodeGeometryPointInstance *data = (NodeGeometryPointInstance *)MEM_callocN(
+               sizeof(NodeGeometryPointInstance), __func__);
+           data->instance_type = node->custom1;
+           data->flag = (node->custom2 ? 0 : GEO_NODE_POINT_INSTANCE_WHOLE_COLLECTION);
+           node->storage = data;
+         }
+       }
+     }
+     FOREACH_NODETREE_END;
+   }
+ 
    /**
     * Versioning code until next subversion bump goes here.
     *