diff --git a/source/blender/blenkernel/BKE_instances.hh b/source/blender/blenkernel/BKE_instances.hh index 20ea3fcd470..c148d5d4c93 100644 --- a/source/blender/blenkernel/BKE_instances.hh +++ b/source/blender/blenkernel/BKE_instances.hh @@ -89,19 +89,19 @@ class Instances { * Contains the data that is used by the individual instances. * Actual instances store an index ("handle") into this vector. */ - blender::Vector references_; + Vector references_; /** Indices into `references_`. Determines what data is instanced. */ - blender::Vector reference_handles_; + Vector reference_handles_; /** Transformation of the instances. */ - blender::Vector transforms_; + Vector transforms_; /* These almost unique ids are generated based on the `id` attribute, which might not contain * unique ids at all. They are *almost* unique, because under certain very unlikely * circumstances, they are not unique. Code using these ids should not crash when they are not * unique but can generally expect them to be unique. */ mutable std::mutex almost_unique_ids_mutex_; - mutable blender::Array almost_unique_ids_; + mutable Array almost_unique_ids_; CustomData attributes_; @@ -134,9 +134,9 @@ class Instances { * argument. For adding many instances, using #resize and accessing the transform array * directly is preferred. */ - void add_instance(int instance_handle, const blender::float4x4 &transform); + void add_instance(int instance_handle, const float4x4 &transform); - blender::Span references() const; + Span references() const; void remove_unused_references(); /** @@ -152,10 +152,10 @@ class Instances { */ GeometrySet &geometry_set_from_reference(int reference_index); - blender::Span reference_handles() const; - blender::MutableSpan reference_handles(); - blender::MutableSpan transforms(); - blender::Span transforms() const; + Span reference_handles() const; + MutableSpan reference_handles(); + MutableSpan transforms(); + Span transforms() const; int instances_num() const; int references_num() const; @@ -164,21 +164,20 @@ class Instances { * Remove the indices that are not contained in the mask input, and remove unused instance * references afterwards. */ - void remove(const blender::IndexMask &mask, - const blender::bke::AnonymousAttributePropagationInfo &propagation_info); + void remove(const IndexMask &mask, const AnonymousAttributePropagationInfo &propagation_info); /** * Get an id for every instance. These can be used for e.g. motion blur. */ - blender::Span almost_unique_ids() const; + Span almost_unique_ids() const; - blender::bke::AttributeAccessor attributes() const; - blender::bke::MutableAttributeAccessor attributes_for_write(); + bke::AttributeAccessor attributes() const; + bke::MutableAttributeAccessor attributes_for_write(); CustomData &custom_data_attributes(); const CustomData &custom_data_attributes() const; void foreach_referenced_geometry( - blender::FunctionRef callback) const; + FunctionRef callback) const; bool owns_direct_data() const; void ensure_owns_direct_data();