diff options
author | Campbell Barton <campbell@blender.org> | 2022-06-01 07:38:06 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-06-01 08:38:48 +0300 |
commit | 44bac4c8ccf19cb5941435115b8f89a9d14e9c23 (patch) | |
tree | 2bd7698ca3e1e382b078e274566dbad0ae82214c /source/blender/nodes/intern | |
parent | ca346d2176737b6aa296617452a8a6cacb7a970a (diff) |
Cleanup: use 'e' prefix for enum types
- CustomDataType -> eCustomDataType
- CustomDataMask -> eCustomDataMask
- AttributeDomain -> eAttrDomain
- NamedAttributeUsage -> eNamedAttrUsage
Diffstat (limited to 'source/blender/nodes/intern')
-rw-r--r-- | source/blender/nodes/intern/geometry_nodes_eval_log.cc | 2 | ||||
-rw-r--r-- | source/blender/nodes/intern/node_geometry_exec.cc | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/nodes/intern/geometry_nodes_eval_log.cc b/source/blender/nodes/intern/geometry_nodes_eval_log.cc index 9a316190720..85dfdf03b82 100644 --- a/source/blender/nodes/intern/geometry_nodes_eval_log.cc +++ b/source/blender/nodes/intern/geometry_nodes_eval_log.cc @@ -495,7 +495,7 @@ void LocalGeoLogger::log_execution_time(DNode node, std::chrono::microseconds ex void LocalGeoLogger::log_used_named_attribute(DNode node, std::string attribute_name, - NamedAttributeUsage usage) + eNamedAttrUsage usage) { used_named_attributes_.append({node, {std::move(attribute_name), usage}}); } diff --git a/source/blender/nodes/intern/node_geometry_exec.cc b/source/blender/nodes/intern/node_geometry_exec.cc index 9aee3ddcce7..27ad12ba252 100644 --- a/source/blender/nodes/intern/node_geometry_exec.cc +++ b/source/blender/nodes/intern/node_geometry_exec.cc @@ -24,7 +24,7 @@ void GeoNodeExecParams::error_message_add(const NodeWarningType type, std::strin } void GeoNodeExecParams::used_named_attribute(std::string attribute_name, - const NamedAttributeUsage usage) + const eNamedAttrUsage usage) { if (provider_->logger == nullptr) { return; @@ -112,8 +112,8 @@ const bNodeSocket *GeoNodeExecParams::find_available_socket(const StringRef name GVArray GeoNodeExecParams::get_input_attribute(const StringRef name, const GeometryComponent &component, - const AttributeDomain domain, - const CustomDataType type, + const eAttrDomain domain, + const eCustomDataType type, const void *default_value) const { const bNodeSocket *found_socket = this->find_available_socket(name); @@ -176,10 +176,10 @@ GVArray GeoNodeExecParams::get_input_attribute(const StringRef name, return GVArray::ForSingle(*cpp_type, domain_num, default_value); } -CustomDataType GeoNodeExecParams::get_input_attribute_data_type( +eCustomDataType GeoNodeExecParams::get_input_attribute_data_type( const StringRef name, const GeometryComponent &component, - const CustomDataType default_type) const + const eCustomDataType default_type) const { const bNodeSocket *found_socket = this->find_available_socket(name); BLI_assert(found_socket != nullptr); /* There should always be available socket for the name. */ @@ -212,12 +212,12 @@ CustomDataType GeoNodeExecParams::get_input_attribute_data_type( return default_type; } -AttributeDomain GeoNodeExecParams::get_highest_priority_input_domain( +eAttrDomain GeoNodeExecParams::get_highest_priority_input_domain( Span<std::string> names, const GeometryComponent &component, - const AttributeDomain default_domain) const + const eAttrDomain default_domain) const { - Vector<AttributeDomain, 8> input_domains; + Vector<eAttrDomain, 8> input_domains; for (const std::string &name : names) { const bNodeSocket *found_socket = this->find_available_socket(name); BLI_assert(found_socket != nullptr); /* A socket should be available socket for the name. */ |