Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2021-01-12 20:47:51 +0300
committerHans Goudey <h.goudey@me.com>2021-01-12 20:47:51 +0300
commitbf5d45fd99d45e3a09acb2aa463a8cc9d37ef7c4 (patch)
tree435d6968ace9db2878f4ecb46b27b06aebfe4cc6
parentabbc43e4e419c44e6d0134aec051d543a0944b3e (diff)
Cleanup: Fix incorrect function name
The function used "domain" incorrectly where it meant "data type".
-rw-r--r--source/blender/nodes/geometry/node_geometry_util.cc4
-rw-r--r--source/blender/nodes/geometry/node_geometry_util.hh2
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/nodes/geometry/node_geometry_util.cc b/source/blender/nodes/geometry/node_geometry_util.cc
index eace75b46b6..53af6073793 100644
--- a/source/blender/nodes/geometry/node_geometry_util.cc
+++ b/source/blender/nodes/geometry/node_geometry_util.cc
@@ -58,7 +58,7 @@ static int attribute_data_type_complexity(const CustomDataType data_type)
return 4;
case CD_PROP_COLOR:
return 5;
-#if 0 /* Attribute types are not supported yet. */
+#if 0 /* These attribute types are not supported yet. */
case CD_MLOOPCOL:
return 3;
case CD_PROP_STRING:
@@ -71,7 +71,7 @@ static int attribute_data_type_complexity(const CustomDataType data_type)
}
}
-CustomDataType attribute_domain_highest_complexity(Span<CustomDataType> data_types)
+CustomDataType attribute_data_type_highest_complexity(Span<CustomDataType> data_types)
{
int highest_complexity = INT_MIN;
CustomDataType most_complex_type = CD_PROP_COLOR;
diff --git a/source/blender/nodes/geometry/node_geometry_util.hh b/source/blender/nodes/geometry/node_geometry_util.hh
index 7c4963b1f3f..0cabe5e1155 100644
--- a/source/blender/nodes/geometry/node_geometry_util.hh
+++ b/source/blender/nodes/geometry/node_geometry_util.hh
@@ -44,7 +44,7 @@ void update_attribute_input_socket_availabilities(bNode &node,
const GeometryNodeAttributeInputMode mode,
const bool name_is_available = true);
-CustomDataType attribute_domain_highest_complexity(Span<CustomDataType>);
+CustomDataType attribute_data_type_highest_complexity(Span<CustomDataType>);
void poisson_disk_point_elimination(Vector<float3> const *input_points,
Vector<float3> *output_points,
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
index abfe3b43cb5..f1a71e7a642 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
@@ -223,7 +223,7 @@ static CustomDataType get_data_type(GeometryComponent &component,
/* Convert the input attributes to the same data type for the equality tests. Use the higher
* complexity attribute type, otherwise information necessary to the comparison may be lost. */
- return attribute_domain_highest_complexity({data_type_a, data_type_b});
+ return attribute_data_type_highest_complexity({data_type_a, data_type_b});
}
/* Use float compare for every operation besides equality. */