forked from bartvdbraak/blender
UI: Correct output attribute name in proximity node
I made an incorrect comment in patch review that "Location" should be used instead of position. "Position" is more appropriate here since it refers to generic data rather than an object origin. "Position" is also the name we chose for the attribute for this reason.
This commit is contained in:
parent
b35a3933ee
commit
f4a9883294
@ -1763,5 +1763,12 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
|
||||
*/
|
||||
{
|
||||
/* Keep this block, even when empty. */
|
||||
|
||||
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
|
||||
if (ntree->type == NTREE_GEOMETRY) {
|
||||
version_node_socket_name(ntree, GEO_NODE_ATTRIBUTE_PROXIMITY, "Location", "Position");
|
||||
}
|
||||
}
|
||||
FOREACH_NODETREE_END;
|
||||
}
|
||||
}
|
||||
|
@ -32,7 +32,7 @@ static bNodeSocketTemplate geo_node_attribute_proximity_in[] = {
|
||||
{SOCK_GEOMETRY, N_("Geometry")},
|
||||
{SOCK_GEOMETRY, N_("Target")},
|
||||
{SOCK_STRING, N_("Distance")},
|
||||
{SOCK_STRING, N_("Location")},
|
||||
{SOCK_STRING, N_("Position")},
|
||||
{-1, ""},
|
||||
};
|
||||
|
||||
@ -172,7 +172,7 @@ static void attribute_calc_proximity(GeometryComponent &component,
|
||||
OutputAttributePtr distance_attribute = component.attribute_try_get_for_output(
|
||||
distance_attribute_name, result_domain, CD_PROP_FLOAT);
|
||||
|
||||
const std::string location_attribute_name = params.get_input<std::string>("Location");
|
||||
const std::string location_attribute_name = params.get_input<std::string>("Position");
|
||||
OutputAttributePtr location_attribute = component.attribute_try_get_for_output(
|
||||
location_attribute_name, result_domain, CD_PROP_FLOAT3);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user