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

[Hans Goudey]

Commit: d64dea8a7eecde75779ed4eaaa9de822913d9096
Author: Hans Goudey
Date:   Fri Apr 16 12:59:47 2021 -0500
Branches: geometry-nodes-curve-support
https://developer.blender.org/rBd64dea8a7eecde75779ed4eaaa9de822913d9096

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

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



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

diff --cc source/blender/modifiers/intern/MOD_nodes.cc
index 8a74a99805f,3481b1c75d9..df45a4945db
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@@ -177,8 -177,16 +177,16 @@@ static void add_object_relation(const M
          add_collection_object_relations_recursive(ctx, *collection_instance);
        }
      }
 -    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);
      }
    }
  }