diff options
author | Hans Goudey <h.goudey@me.com> | 2021-11-02 23:16:52 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-11-02 23:16:52 +0300 |
commit | 18392cef17ddb40857fdb2462d8bad50f389029b (patch) | |
tree | f0fad510f46ce175ab9dd63529b4f06a726205f2 /source/blender/blenkernel/intern/attribute_access.cc | |
parent | 7aa311e5396bca5d65ba9cd00060d61bafbf28e9 (diff) |
Fix T92652: Joining curves breaks point attribute order
Currently the curve to mesh node relies on the order of attributes being
the same on every spline. This is a worthwhile assumption, because it
will allow removing the attribute name storage duplication on every
spline in the future.
However, the join geometry node broke this order, since it just created
new attributes without any regard to the order. To fix this, I added a
"reorder" step after all the merged attributes have been created, the
types have been joined, etc. It should be possible to change this code
so that the attributes are added with the right order in the first
place, but I would like to do that after refactoring spline attribute
storage, and not for 3.0.
Differential Revision: https://developer.blender.org/D13074
Diffstat (limited to 'source/blender/blenkernel/intern/attribute_access.cc')
-rw-r--r-- | source/blender/blenkernel/intern/attribute_access.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/attribute_access.cc b/source/blender/blenkernel/intern/attribute_access.cc index aeb66dc5a33..cd394a4ca42 100644 --- a/source/blender/blenkernel/intern/attribute_access.cc +++ b/source/blender/blenkernel/intern/attribute_access.cc @@ -835,6 +835,26 @@ bool CustomDataAttributes::foreach_attribute(const AttributeForeachCallback call return true; } +void CustomDataAttributes::reorder(Span<AttributeIDRef> new_order) +{ + BLI_assert(new_order.size() == data.totlayer); + + Map<AttributeIDRef, int> old_order; + old_order.reserve(data.totlayer); + Array<CustomDataLayer> old_layers(Span(data.layers, data.totlayer)); + for (const int i : old_layers.index_range()) { + old_order.add_new(attribute_id_from_custom_data_layer(old_layers[i]), i); + } + + MutableSpan layers(data.layers, data.totlayer); + for (const int i : layers.index_range()) { + const int old_index = old_order.lookup(new_order[i]); + layers[i] = old_layers[old_index]; + } + + CustomData_update_typemap(&data); +} + } // namespace blender::bke /* -------------------------------------------------------------------- */ |