griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-11-05 14:08:57 +11:00
parent 94a5f541c3 10e6fee4ef
commit 8d90a2afd9
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/geometry/intern/mix_geometries.cc
View File

@@ -178,12 +178,13 @@ bke::GeometrySet mix_geometries(bke::GeometrySet a, const bke::GeometrySet &b, c
bke::MutableAttributeAccessor a = curves_a->geometry.wrap().attributes_for_write();
const bke::AttributeAccessor b = curves_b->geometry.wrap().attributes();
const Array<int> index_map = create_id_index_map(a, b);
mix_attributes(a,
b,
index_map,
bke::AttrDomain::Point,
factor,
{"handle_type_left", "handle_type_right"});
mix_attributes(
a,
b,
index_map,
bke::AttrDomain::Point,
factor,
{"curve_type", "nurbs_order", "knots_mode", "handle_type_left", "handle_type_right"});
}
}
if (bke::Instances *instances_a = a.get_instances_for_write()) {
@@ -195,7 +196,7 @@ bke::GeometrySet mix_geometries(bke::GeometrySet a, const bke::GeometrySet &b, c
index_map,
bke::AttrDomain::Instance,
factor,
{});
{".reference_index"});
}
}
return a;