diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-11-12 22:26:26 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-11-12 22:26:26 +0300 |
| commit | 5b787c24fb4b04f465474076858a9f7757dc54d4 (patch) | |
| tree | 98741d17060abe95b509b7ba8088ae95edaa19c9 /source | |
| parent | 1b55b911f24e57013167a29f4e01c091020421bc (diff) | |
| parent | 888b879f5f4ea8ef5f01d466ab0871b48c8f0a95 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc index f1b100c15d0..9754b3f81a0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc @@ -42,7 +42,8 @@ static void geo_node_transfer_attribute_declare(NodeDeclarationBuilder &b) { b.add_input<decl::Geometry>(N_("Target")) .only_realized_data() - .supported_type({GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_POINT_CLOUD}); + .supported_type( + {GEO_COMPONENT_TYPE_MESH, GEO_COMPONENT_TYPE_POINT_CLOUD, GEO_COMPONENT_TYPE_CURVE}); b.add_input<decl::Vector>(N_("Attribute")).hide_value().supports_field(); b.add_input<decl::Float>(N_("Attribute"), "Attribute_001").hide_value().supports_field(); @@ -769,6 +770,8 @@ static void geo_node_transfer_attribute_exec(GeoNodeExecParams params) } case GEO_NODE_ATTRIBUTE_TRANSFER_NEAREST: { if (geometry.has_curve() && !geometry.has_mesh() && !geometry.has_pointcloud()) { + params.error_message_add(NodeWarningType::Error, + TIP_("The target geometry must contain a mesh or a point cloud")); return return_default(); } auto fn = std::make_unique<NearestTransferFunction>( |