[Bf-blender-cvs] [936dfae3de1] geometry-nodes-curve-support: Merge branch 'master' into geometry-nodes-curve-support

[Hans Goudey]

Commit: 936dfae3de1f179c751606a1a971facacd32ae04
Author: Hans Goudey
Date:   Mon Apr 26 15:14:32 2021 -0500
Branches: geometry-nodes-curve-support
https://developer.blender.org/rB936dfae3de1f179c751606a1a971facacd32ae04

Merge branch 'master' into geometry-nodes-curve-support

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



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

diff --cc source/blender/blenkernel/BKE_geometry_set.hh
index 677d869666b,89cdef34297..cb0d0b25a33
--- a/source/blender/blenkernel/BKE_geometry_set.hh
+++ b/source/blender/blenkernel/BKE_geometry_set.hh
@@@ -389,8 -380,8 +389,10 @@@ struct GeometrySet 
    void replace_mesh(Mesh *mesh, GeometryOwnershipType ownership = GeometryOwnershipType::Owned);
    void replace_pointcloud(PointCloud *pointcloud,
                            GeometryOwnershipType ownership = GeometryOwnershipType::Owned);
+   void replace_volume(Volume *volume,
+                       GeometryOwnershipType ownership = GeometryOwnershipType::Owned);
 +  void replace_curve(SplineGroup *mesh,
 +                     GeometryOwnershipType ownership = GeometryOwnershipType::Owned);
  };
  
  /** A geometry component that can store a mesh. */
diff --cc source/blender/modifiers/intern/MOD_nodes.cc
index f72a21ffe1b,cc8f4a544c0..c71a6cd6813
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@@ -171,22 -182,12 +182,12 @@@ static void add_object_relation(const M
  {
    DEG_add_object_relation(ctx->node, &object, DEG_OB_COMP_TRANSFORM, "Nodes Modifier");
    if (&(ID &)object != &ctx->object->id) {
-     if (object.type == OB_EMPTY) {
-       Collection *collection_instance = object.instance_collection;
-       if (collection_instance != nullptr) {
-         add_collection_object_relations_recursive(ctx, *collection_instance);
-       }
+     if (object.type == OB_EMPTY && object.instance_collection != nullptr) {
+       add_collection_relation(ctx, *object.instance_collection);
      }
 -    else if (ELEM(object.type, OB_MESH, OB_POINTCLOUD, OB_VOLUME)) {
 +    else if (ELEM(object.type, OB_MESH, OB_POINTCLOUD, OB_VOLUME, OB_CURVE)) {
        DEG_add_object_relation(ctx->node, &object, DEG_OB_COMP_GEOMETRY, "Nodes Modifier");
-       /* We don't know exactly what attributes from the other object we will need. */
-       CustomData_MeshMasks mask;
-       mask.vmask = CD_MASK_PROP_ALL | CD_MASK_MDEFORMVERT;
-       mask.pmask = CD_MASK_PROP_ALL;
-       mask.lmask = CD_MASK_PROP_ALL;
-       mask.fmask = CD_MASK_PROP_ALL;
-       mask.emask = CD_MASK_PROP_ALL;
-       DEG_add_customdata_mask(ctx->node, &object, &mask);
+       DEG_add_customdata_mask(ctx->node, &object, &dependency_data_mask);
      }
    }
  }