From c822e03e2a58e23d9ef82b30b012f59ae7d1c425 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Tue, 30 Nov 2021 10:59:11 -0500 Subject: Fix: Missing handling of dynamic instance attribute size The attributes need to be reallocated when the size changes. Differential Revision: https://developer.blender.org/D13390 --- source/blender/blenkernel/BKE_attribute_access.hh | 2 ++ source/blender/blenkernel/intern/attribute_access.cc | 6 ++++++ source/blender/blenkernel/intern/geometry_component_instances.cc | 4 ++++ 3 files changed, 12 insertions(+) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_attribute_access.hh b/source/blender/blenkernel/BKE_attribute_access.hh index 47f62b52a0f..4402f6fbf74 100644 --- a/source/blender/blenkernel/BKE_attribute_access.hh +++ b/source/blender/blenkernel/BKE_attribute_access.hh @@ -345,6 +345,8 @@ class CustomDataAttributes { void reallocate(const int size); + void clear(); + std::optional get_for_read(const AttributeIDRef &attribute_id) const; blender::fn::GVArray get_for_read(const AttributeIDRef &attribute_id, diff --git a/source/blender/blenkernel/intern/attribute_access.cc b/source/blender/blenkernel/intern/attribute_access.cc index 47ddb2494d0..902e08f1b28 100644 --- a/source/blender/blenkernel/intern/attribute_access.cc +++ b/source/blender/blenkernel/intern/attribute_access.cc @@ -821,6 +821,12 @@ void CustomDataAttributes::reallocate(const int size) CustomData_realloc(&data, size); } +void CustomDataAttributes::clear() +{ + CustomData_free(&data, size_); + size_ = 0; +} + bool CustomDataAttributes::foreach_attribute(const AttributeForeachCallback callback, const AttributeDomain domain) const { diff --git a/source/blender/blenkernel/intern/geometry_component_instances.cc b/source/blender/blenkernel/intern/geometry_component_instances.cc index 9a30c86c1e5..29c28a875c1 100644 --- a/source/blender/blenkernel/intern/geometry_component_instances.cc +++ b/source/blender/blenkernel/intern/geometry_component_instances.cc @@ -63,6 +63,7 @@ void InstancesComponent::reserve(int min_capacity) if (!instance_ids_.is_empty()) { this->instance_ids_ensure(); } + attributes_.reallocate(min_capacity); } /** @@ -78,6 +79,7 @@ void InstancesComponent::resize(int capacity) if (!instance_ids_.is_empty()) { this->instance_ids_ensure(); } + attributes_.reallocate(capacity); } void InstancesComponent::clear() @@ -85,6 +87,7 @@ void InstancesComponent::clear() instance_reference_handles_.clear(); instance_transforms_.clear(); instance_ids_.clear(); + attributes_.clear(); references_.clear(); } @@ -98,6 +101,7 @@ void InstancesComponent::add_instance(const int instance_handle, const float4x4 if (!instance_ids_.is_empty()) { this->instance_ids_ensure(); } + attributes_.reallocate(this->instances_amount()); } blender::Span InstancesComponent::instance_reference_handles() const -- cgit v1.2.3