From 44bac4c8ccf19cb5941435115b8f89a9d14e9c23 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 1 Jun 2022 14:38:06 +1000 Subject: Cleanup: use 'e' prefix for enum types - CustomDataType -> eCustomDataType - CustomDataMask -> eCustomDataMask - AttributeDomain -> eAttrDomain - NamedAttributeUsage -> eNamedAttrUsage --- source/blender/nodes/NOD_geometry_exec.hh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'source/blender/nodes/NOD_geometry_exec.hh') diff --git a/source/blender/nodes/NOD_geometry_exec.hh b/source/blender/nodes/NOD_geometry_exec.hh index bac4d0165e9..176a240791e 100644 --- a/source/blender/nodes/NOD_geometry_exec.hh +++ b/source/blender/nodes/NOD_geometry_exec.hh @@ -40,7 +40,7 @@ using fn::FieldInput; using fn::FieldOperation; using fn::GField; using fn::ValueOrField; -using geometry_nodes_eval_log::NamedAttributeUsage; +using geometry_nodes_eval_log::eNamedAttrUsage; using geometry_nodes_eval_log::NodeWarningType; /** @@ -307,17 +307,17 @@ class GeoNodeExecParams { */ GVArray get_input_attribute(const StringRef name, const GeometryComponent &component, - AttributeDomain domain, - const CustomDataType type, + eAttrDomain domain, + const eCustomDataType type, const void *default_value) const; template VArray get_input_attribute(const StringRef name, const GeometryComponent &component, - const AttributeDomain domain, + const eAttrDomain domain, const T &default_value) const { - const CustomDataType type = bke::cpp_type_to_custom_data_type(CPPType::get()); + const eCustomDataType type = bke::cpp_type_to_custom_data_type(CPPType::get()); GVArray varray = this->get_input_attribute(name, component, domain, type, &default_value); return varray.typed(); } @@ -326,24 +326,24 @@ class GeoNodeExecParams { * Get the type of an input property or the associated constant socket types with the * same names. Fall back to the default value if no attribute exists with the name. */ - CustomDataType get_input_attribute_data_type(const StringRef name, - const GeometryComponent &component, - const CustomDataType default_type) const; + eCustomDataType get_input_attribute_data_type(const StringRef name, + const GeometryComponent &component, + const eCustomDataType default_type) const; /** * If any of the corresponding input sockets are attributes instead of single values, * use the highest priority attribute domain from among them. * Otherwise return the default domain. */ - AttributeDomain get_highest_priority_input_domain(Span names, - const GeometryComponent &component, - AttributeDomain default_domain) const; + eAttrDomain get_highest_priority_input_domain(Span names, + const GeometryComponent &component, + eAttrDomain default_domain) const; std::string attribute_producer_name() const; void set_default_remaining_outputs(); - void used_named_attribute(std::string attribute_name, NamedAttributeUsage usage); + void used_named_attribute(std::string attribute_name, eNamedAttrUsage usage); private: /* Utilities for detecting common errors at when using this class. */ -- cgit v1.2.3