From 42e275a7d4fff6464024d99a78f69f1cb490d930 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 11 May 2022 12:59:58 +1000 Subject: Cleanup: use '_num' suffix, mostly for curves & spline code Replace tot/amount & size with num, in keeping with T85728. --- .../blender/blenkernel/intern/attribute_access_intern.hh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/blenkernel/intern/attribute_access_intern.hh') diff --git a/source/blender/blenkernel/intern/attribute_access_intern.hh b/source/blender/blenkernel/intern/attribute_access_intern.hh index 8c021ed0e21..f0f47cb7a11 100644 --- a/source/blender/blenkernel/intern/attribute_access_intern.hh +++ b/source/blender/blenkernel/intern/attribute_access_intern.hh @@ -172,8 +172,8 @@ class CustomDataAttributeProvider final : public DynamicAttributesProvider { */ class NamedLegacyCustomDataProvider final : public DynamicAttributesProvider { private: - using AsReadAttribute = GVArray (*)(const void *data, int domain_size); - using AsWriteAttribute = GVMutableArray (*)(void *data, int domain_size); + using AsReadAttribute = GVArray (*)(const void *data, int domain_num); + using AsWriteAttribute = GVMutableArray (*)(void *data, int domain_num); const AttributeDomain domain_; const CustomDataType attribute_type_; const CustomDataType stored_type_; @@ -207,14 +207,14 @@ class NamedLegacyCustomDataProvider final : public DynamicAttributesProvider { void foreach_domain(const FunctionRef callback) const final; }; -template GVArray make_array_read_attribute(const void *data, const int domain_size) +template GVArray make_array_read_attribute(const void *data, const int domain_num) { - return VArray::ForSpan(Span((const T *)data, domain_size)); + return VArray::ForSpan(Span((const T *)data, domain_num)); } -template GVMutableArray make_array_write_attribute(void *data, const int domain_size) +template GVMutableArray make_array_write_attribute(void *data, const int domain_num) { - return VMutableArray::ForSpan(MutableSpan((T *)data, domain_size)); + return VMutableArray::ForSpan(MutableSpan((T *)data, domain_num)); } /** @@ -226,8 +226,8 @@ template GVMutableArray make_array_write_attribute(void *data, const * if the stored type is the same as the attribute type. */ class BuiltinCustomDataLayerProvider final : public BuiltinAttributeProvider { - using AsReadAttribute = GVArray (*)(const void *data, int domain_size); - using AsWriteAttribute = GVMutableArray (*)(void *data, int domain_size); + using AsReadAttribute = GVArray (*)(const void *data, int domain_num); + using AsWriteAttribute = GVMutableArray (*)(void *data, int domain_num); using UpdateOnRead = void (*)(const GeometryComponent &component); using UpdateOnWrite = void (*)(GeometryComponent &component); const CustomDataType stored_type_; -- cgit v1.2.3