Page MenuHome
Paste P2565

(An Untitled Masterwork)
ActivePublic
Actions

Authored by Jacques Lucke (JacquesLucke) on Nov 2 2021, 1:59 PM.
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc
index 5cc8f1476f8..bd8ec5e5990 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc
@@ -144,7 +144,7 @@ static void geo_node_attribute_capture_exec(GeoNodeExecParams params)
break;
}
- WeakAnonymousAttributeID anonymous_id{"Attribute"};
+ WeakAnonymousAttributeID anonymous_id{params.node().name};
const CPPType &type = field.cpp_type();
static const Array<GeometryComponentType> types = {
diff --git a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
index cd385f364e9..ef9e072fc8c 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
@@ -450,6 +450,16 @@ static void join_curve_components(MutableSpan<GeometrySet> src_geometry_sets, Ge
join_curve_attributes(info, src_components, *dst_curve);
+ for (const int i : dst_curve->splines().index_range()) {
+ std::cout << i << ": \n";
+ dst_curve->splines()[i]->attributes.foreach_attribute(
+ [&](const AttributeIDRef &attribute_id, const AttributeMetaData &meta_data) {
+ std::cout << " " << attribute_id << "\n";
+ return true;
+ },
+ ATTR_DOMAIN_POINT);
+ }
+
dst_component.replace(dst_curve);
}