This updates the join node to use the new multi-input socket from D10067.
The change just requires slightly changing the arguments of the exec
function, and changing the socket input list.
Details
Details
Diff Detail
Diff Detail
- Repository
- rB Blender
- Branch
- geometry_nodes_multi_input_socket_join_geometry (branched from master)
- Build Status
Buildable 12633 Build 12633: arc lint + arc unit
Event Timeline
| source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc | ||
|---|---|---|
| 287–290 | With a small tweak to join_component_type, you should be able to simply pass a reference to the original geometry_sets vector. | |
Comment Actions
Changed join_component_type() to use extracted multi input vector directly. Based on the review by Hans Goudey.
Comment Actions
This needs versioning to connect the second socket of existing join nodes to the first multi-input socket in existing files.
version_node_socket_name might be helpful as a simple example of versioning node sockets.
Comment Actions
Added versioning for Join Geometry to use Multi Input Socket based on Review by Hans Goudey.
| source/blender/blenloader/intern/versioning_290.c | ||
|---|---|---|
| 750 | This probably leaks memory. Even if it's just a few bytes for every join node, the socket should be freed. nodeRemoveSocket should do the trick. | |
| 1573 | You'll probably have to bump the file subversion in BKE_blender_version.h and use another if statement instead of adding it here. | |