blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Geometry Nodes: Change Collection Info output socket name to Instances 

As described in T101948, this commit changes socket name to be more
consistent with other nodes that generate instances output.

Differential Revision: https://developer.blender.org/D16394
This commit is contained in:
Iliya Katueshenock 2022-11-26 18:11:01 -06:00 committed by Hans Goudey
parent 42485b01d2
commit 9fa4ceb340
Notes: blender-bot 2023-02-14 12:01:57 +01:00 
Referenced by issue #101948, Consistent socket name for Collection Info node
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenloader/intern/versioning_300.cc
View File

@ -3729,5 +3729,11 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
*/
{
/* Keep this block, even when empty. */
LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
if (ntree->type == NTREE_GEOMETRY) {
version_node_socket_name(ntree, GEO_NODE_COLLECTION_INFO, "Geometry", "Instances");
}
}
}
}

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

@ -28,7 +28,7 @@ static void node_declare(NodeDeclarationBuilder &b)
.description(
N_("Reset the transforms of every child instance in the output. Only used when Separate "
"Children is enabled"));
b.add_output<decl::Geometry>(N_("Geometry"));
b.add_output<decl::Geometry>(N_("Instances"));
}
static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
@ -137,7 +137,7 @@ static void node_geo_exec(GeoNodeExecParams params)
instances->add_instance(handle, transform);
}
params.set_output("Geometry", GeometrySet::create_with_instances(instances.release()));
params.set_output("Instances", GeometrySet::create_with_instances(instances.release()));
}
} // namespace blender::nodes::node_geo_collection_info_cc