blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Hans Goudey 2021-11-05 10:57:04 -05:00
parent bbd8d33453 594ee5f160
commit 212dcd6075
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/geometry_set_instances.cc
View File

@ -540,8 +540,11 @@ static void sort_curve_point_attributes(const Map<AttributeIDRef, AttributeKind>
MutableSpan<SplinePtr> splines)
{
Vector<AttributeIDRef> new_order;
for (const AttributeIDRef attribute_id : info.keys()) {
new_order.append(attribute_id);
for (Map<AttributeIDRef, AttributeKind>::Item item : info.items()) {
if (item.value.domain == ATTR_DOMAIN_POINT) {
/* Only sort attributes stored on splines. */
new_order.append(item.key);
}
}
for (SplinePtr &spline : splines) {
spline->attributes.reorder(new_order);

7
source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
View File

@ -366,8 +366,11 @@ static void sort_curve_point_attributes(const Map<AttributeIDRef, AttributeMetaD
MutableSpan<SplinePtr> splines)
{
Vector<AttributeIDRef> new_order;
for (const AttributeIDRef attribute_id : info.keys()) {
new_order.append(attribute_id);
for (Map<AttributeIDRef, AttributeMetaData>::Item item : info.items()) {
if (item.value.domain == ATTR_DOMAIN_POINT) {
/* Only sort attributes stored on splines. */
new_order.append(item.key);
}
}
for (SplinePtr &spline : splines) {
spline->attributes.reorder(new_order);