blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T94581: Incorrect geometry delete behavior with instances 

Compare the start of the range to zero to figure out whether the
indices for the instances to keep starts at zero. Also rename the
selection argument, since it made it seem like the selected indices
should be removed rather than kept.
This commit is contained in:
Hans Goudey 2022-01-03 13:19:04 -06:00
parent a42e972e1b
commit c6069c439c
Notes: blender-bot 2023-02-14 10:04:50 +01:00 
Referenced by issue #94581, Geometry Nodes: Delete Geometry deletes wrong instances if their indices form a range starting from 0
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/BKE_geometry_set.hh
View File

@ -923,9 +923,10 @@ class InstancesComponent : public GeometryComponent {
int references_amount() const;
/**
* Remove the indices in the selection mask and remove unused instance references afterwards.
* Remove the indices that are not contained in the mask input, and remove unused instance
* references afterwards.
*/
void remove_instances(const blender::IndexMask selection);
void remove_instances(const blender::IndexMask mask);
blender::Span<int> almost_unique_ids() const;

18
source/blender/blenkernel/intern/geometry_component_instances.cc
View File

@ -148,27 +148,27 @@ static void copy_data_based_on_mask(Span<T> src, MutableSpan<T> dst, IndexMask m
});
}
void InstancesComponent::remove_instances(const IndexMask selection)
void InstancesComponent::remove_instances(const IndexMask mask)
{
using namespace blender;
if (selection.is_range() && selection.index_range().first() == 0) {
if (mask.is_range() && mask.as_range().start() == 0) {
/* Deleting from the end of the array can be much faster since no data has to be shifted. */
this->resize(selection.size());
this->resize(mask.size());
this->remove_unused_references();
return;
}
Vector<int> new_handles(selection.size());
copy_data_based_on_mask<int>(this->instance_reference_handles(), new_handles, selection);
Vector<int> new_handles(mask.size());
copy_data_based_on_mask<int>(this->instance_reference_handles(), new_handles, mask);
instance_reference_handles_ = std::move(new_handles);
Vector<float4x4> new_transforms(selection.size());
copy_data_based_on_mask<float4x4>(this->instance_transforms(), new_transforms, selection);
Vector<float4x4> new_transforms(mask.size());
copy_data_based_on_mask<float4x4>(this->instance_transforms(), new_transforms, mask);
instance_transforms_ = std::move(new_transforms);
const bke::CustomDataAttributes &src_attributes = attributes_;
bke::CustomDataAttributes dst_attributes;
dst_attributes.reallocate(selection.size());
dst_attributes.reallocate(mask.size());
src_attributes.foreach_attribute(
[&](const bke::AttributeIDRef &id, const AttributeMetaData &meta_data) {
@ -182,7 +182,7 @@ void InstancesComponent::remove_instances(const IndexMask selection)
attribute_math::convert_to_static_type(src.type(), [&](auto dummy) {
using T = decltype(dummy);
copy_data_based_on_mask<T>(src.typed<T>(), dst.typed<T>(), selection);
copy_data_based_on_mask<T>(src.typed<T>(), dst.typed<T>(), mask);
});
return true;
},

2
source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
View File

@ -545,7 +545,7 @@ static void separate_instance_selection(GeometrySet &geometry_set,
Vector<int64_t> indices;
const IndexMask mask = index_mask_indices(selection, invert, indices);
if (mask.size() == 0) {
if (mask.is_empty()) {
geometry_set.remove<InstancesComponent>();
return;
}