From 3e16f3b3ef4b8f385b30fe4a1e00860620f610ee Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Sat, 19 Mar 2022 08:26:29 +0100 Subject: BLI: move generic data structures to blenlib This is a follow up to rB2252bc6a5527cd7360d1ccfe7a2d1bc640a8dfa6. --- source/blender/blenkernel/BKE_geometry_set.hh | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'source/blender/blenkernel/BKE_geometry_set.hh') diff --git a/source/blender/blenkernel/BKE_geometry_set.hh b/source/blender/blenkernel/BKE_geometry_set.hh index 372922a24d2..bd392057436 100644 --- a/source/blender/blenkernel/BKE_geometry_set.hh +++ b/source/blender/blenkernel/BKE_geometry_set.hh @@ -131,9 +131,9 @@ class GeometryComponent { * interpolate from one domain to another. * \return null if the interpolation is not implemented. */ - blender::fn::GVArray attribute_try_adapt_domain(const blender::fn::GVArray &varray, - const AttributeDomain from_domain, - const AttributeDomain to_domain) const + blender::GVArray attribute_try_adapt_domain(const blender::GVArray &varray, + const AttributeDomain from_domain, + const AttributeDomain to_domain) const { return this->attribute_try_adapt_domain_impl(varray, from_domain, to_domain); } @@ -177,17 +177,17 @@ class GeometryComponent { * and converted to the data type. Returns null when the attribute does not exist or cannot be * interpolated or converted. */ - blender::fn::GVArray attribute_try_get_for_read(const blender::bke::AttributeIDRef &attribute_id, - AttributeDomain domain, - const CustomDataType data_type) const; + blender::GVArray attribute_try_get_for_read(const blender::bke::AttributeIDRef &attribute_id, + AttributeDomain domain, + const CustomDataType data_type) const; /** * Get a virtual array that refers to the data of an attribute, interpolated to the given domain. * The data type is left unchanged. Returns null when the attribute does not exist or cannot be * interpolated. */ - blender::fn::GVArray attribute_try_get_for_read(const blender::bke::AttributeIDRef &attribute_id, - AttributeDomain domain) const; + blender::GVArray attribute_try_get_for_read(const blender::bke::AttributeIDRef &attribute_id, + AttributeDomain domain) const; /** * Get a virtual array that refers to the data of an attribute converted to the given data type. @@ -202,10 +202,10 @@ class GeometryComponent { * and converted to the data type. If that is not possible, the returned virtual array will * contain a default value. This never returns null. */ - blender::fn::GVArray attribute_get_for_read(const blender::bke::AttributeIDRef &attribute_id, - AttributeDomain domain, - const CustomDataType data_type, - const void *default_value = nullptr) const; + blender::GVArray attribute_get_for_read(const blender::bke::AttributeIDRef &attribute_id, + AttributeDomain domain, + const CustomDataType data_type, + const void *default_value = nullptr) const; /* Use instead of the method above when the type is known at compile time for type safety. */ template blender::VArray attribute_get_for_read(const blender::bke::AttributeIDRef &attribute_id, @@ -268,9 +268,9 @@ class GeometryComponent { private: virtual const blender::bke::ComponentAttributeProviders *get_attribute_providers() const; - virtual blender::fn::GVArray attribute_try_adapt_domain_impl(const blender::fn::GVArray &varray, - AttributeDomain from_domain, - AttributeDomain to_domain) const; + virtual blender::GVArray attribute_try_adapt_domain_impl(const blender::GVArray &varray, + AttributeDomain from_domain, + AttributeDomain to_domain) const; }; template @@ -568,9 +568,9 @@ class MeshComponent : public GeometryComponent { private: const blender::bke::ComponentAttributeProviders *get_attribute_providers() const final; - blender::fn::GVArray attribute_try_adapt_domain_impl(const blender::fn::GVArray &varray, - AttributeDomain from_domain, - AttributeDomain to_domain) const final; + blender::GVArray attribute_try_adapt_domain_impl(const blender::GVArray &varray, + AttributeDomain from_domain, + AttributeDomain to_domain) const final; }; /** @@ -672,9 +672,9 @@ class CurveComponentLegacy : public GeometryComponent { private: const blender::bke::ComponentAttributeProviders *get_attribute_providers() const final; - blender::fn::GVArray attribute_try_adapt_domain_impl(const blender::fn::GVArray &varray, - AttributeDomain from_domain, - AttributeDomain to_domain) const final; + blender::GVArray attribute_try_adapt_domain_impl(const blender::GVArray &varray, + AttributeDomain from_domain, + AttributeDomain to_domain) const final; }; /** @@ -729,9 +729,9 @@ class CurveComponent : public GeometryComponent { private: const blender::bke::ComponentAttributeProviders *get_attribute_providers() const final; - blender::fn::GVArray attribute_try_adapt_domain_impl(const blender::fn::GVArray &varray, - AttributeDomain from_domain, - AttributeDomain to_domain) const final; + blender::GVArray attribute_try_adapt_domain_impl(const blender::GVArray &varray, + AttributeDomain from_domain, + AttributeDomain to_domain) const final; }; /** -- cgit v1.2.3