griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: remove unnecessary namespace specifier

Browse Source
This commit is contained in:
Jacques Lucke
2023-10-19 12:28:11 +02:00
parent 36c127805f
commit a5b8a04cb0
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/blenkernel/BKE_instances.hh
View File

@@ -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<InstanceReference> references_;
Vector<InstanceReference> references_;
/** Indices into `references_`. Determines what data is instanced. */
blender::Vector<int> reference_handles_;
Vector<int> reference_handles_;
/** Transformation of the instances. */
blender::Vector<blender::float4x4> transforms_;
Vector<float4x4> 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<int> almost_unique_ids_;
mutable Array<int> 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<InstanceReference> references() const;
Span<InstanceReference> references() const;
void remove_unused_references();
/**
@@ -152,10 +152,10 @@ class Instances {
*/
GeometrySet &geometry_set_from_reference(int reference_index);
blender::Span<int> reference_handles() const;
blender::MutableSpan<int> reference_handles();
blender::MutableSpan<blender::float4x4> transforms();
blender::Span<blender::float4x4> transforms() const;
Span<int> reference_handles() const;
MutableSpan<int> reference_handles();
MutableSpan<float4x4> transforms();
Span<float4x4> 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<int> almost_unique_ids() const;
Span<int> 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<void(const GeometrySet &geometry_set)> callback) const;
FunctionRef<void(const GeometrySet &geometry_set)> callback) const;
bool owns_direct_data() const;
void ensure_owns_direct_data();