blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Cleanup: Fix incorrect function name 

The function used "domain" incorrectly where it meant "data type".
This commit is contained in:
Hans Goudey 2021-01-12 11:47:51 -06:00
parent abbc43e4e4
commit bf5d45fd99
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/nodes/geometry/node_geometry_util.cc
View File

@ -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;

2
source/blender/nodes/geometry/node_geometry_util.hh
View File

@ -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,

2
source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
View File

@ -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. */