Details

Reviewers

Commits

rB9a9e19fdcc48: Geometry Nodes: Use multi-input socket in join geometry node

Summary

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.

Diff Detail

Repository

rB Blender

Branch

geometry_nodes_multi_input_socket_join_geometry (branched from master)

Build Status

Buildable 12089
Build 12089: arc lint + arc unit

Event Timeline

Fabian Schempp (fabian_schempp) created this revision.Jan 11 2021, 11:19 AM

Harbormaster completed remote builds in B12089: Diff 32599.Jan 11 2021, 11:19 AM

Fabian Schempp (fabian_schempp) requested review of this revision.Jan 11 2021, 11:19 AM

Geometry Nodes: Changes Join Geometry Node to use Multi Input Sockets

Harbormaster completed remote builds in B12090: Diff 32600.Jan 11 2021, 11:26 AM

• FabianSchempp (FabianSchempp) retitled this revision from make multi input sockets displayed as diamond shape for now to Geometry Nodes: Changes Join Geometry Node to use Multi Input Sockets.Jan 11 2021, 11:29 AM

• FabianSchempp (FabianSchempp) edited the summary of this revision. (Show Details)

• FabianSchempp (FabianSchempp) added a project: Geometry Nodes.

• FabianSchempp (FabianSchempp) mentioned this in D10067: Geometry Nodes: Multi Input Sockets.

• FabianSchempp (FabianSchempp) added a project: Nodes.

• FabianSchempp (FabianSchempp) added a subscriber: • FabianSchempp (FabianSchempp).

• FabianSchempp (FabianSchempp) edited the summary of this revision. (Show Details)Jan 11 2021, 12:09 PM

rebase to master
changes based on review by Jacques Lucke

Harbormaster completed remote builds in B12259: Diff 32890.Jan 19 2021, 12:13 AM

rebase onto master
changes based on review by Jacques Lucke

Harbormaster completed remote builds in B12260: Diff 32891.Jan 19 2021, 12:16 AM

Hans Goudey (HooglyBoogly) added a subscriber: Hans Goudey (HooglyBoogly).Jan 19 2021, 3:56 AM

Hans Goudey (HooglyBoogly) added inline comments.

source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
263–266	With a small tweak to `join_component_type`, you should be able to simply pass a reference to the original `geometry_sets` vector.

Changed join_component_type() to use extracted multi input vector directly. Based on the review by Hans Goudey.

Harbormaster completed remote builds in B12287: Diff 32946.Jan 19 2021, 11:18 PM

Fabian Schempp (fabian_schempp) marked an inline comment as done.Jan 19 2021, 11:18 PM

rebased to current

Harbormaster completed remote builds in B12333: Diff 33047.Jan 23 2021, 1:45 AM

Rebased to base.

Harbormaster completed remote builds in B12486: Diff 33327.Jan 29 2021, 11:27 PM

Rebased to base

Harbormaster completed remote builds in B12487: Diff 33328.Jan 29 2021, 11:30 PM

Reverted unneeded change

Harbormaster completed remote builds in B12488: Diff 33329.Jan 29 2021, 11:32 PM

Fabian Schempp (fabian_schempp) added a parent revision: D10067: Geometry Nodes: Multi Input Sockets.Jan 29 2021, 11:32 PM

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.

This revision now requires changes to proceed.Feb 2 2021, 1:30 AM

Hans Goudey (HooglyBoogly) edited the summary of this revision. (Show Details)Feb 2 2021, 1:33 AM

Hans Goudey (HooglyBoogly) mentioned this in rBc5514d3a2a03: Geometry Nodes: Multi-Input Sockets.Feb 3 2021, 6:03 PM

Added versioning for Join Geometry to use Multi Input Socket based on Review by Hans Goudey.

Harbormaster completed remote builds in B12594: Diff 33519.Feb 4 2021, 12:44 AM

Reverted unneeded change.

Harbormaster completed remote builds in B12596: Diff 33521.Feb 4 2021, 12:52 AM

Reverted more unneeded changes.

Harbormaster completed remote builds in B12597: Diff 33522.Feb 4 2021, 12:55 AM

In D10069#257768, @Hans Goudey (HooglyBoogly) wrote:

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.

Done.

Hans Goudey (HooglyBoogly) added inline comments.Feb 4 2021, 12:57 AM

source/blender/blenlib/intern/math_base.c
119–120	Looks like some of the changes from the other patch made it in here.
source/blender/functions/FN_generic_pointer.hh
53–54 ↗	(On Diff #33521)	Doesn't look like these changes are used?

Oops, looks like I didn't reload in time.

Hans Goudey (HooglyBoogly) added inline comments.Feb 4 2021, 1:01 AM

source/blender/blenloader/intern/versioning_290.c
750 ↗	(On Diff #33522)	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 ↗	(On Diff #33522)	You'll probably have to bump the file subversion in `BKE_blender_version.h` and use another if statement instead of adding it here.

Changes to versioning and subversion based on Review by Hans Goudey.

Harbormaster completed remote builds in B12631: Diff 33569.Feb 4 2021, 5:56 PM

Fixed a small bug with versioning.

Harbormaster completed remote builds in B12633: Diff 33571.Feb 4 2021, 6:05 PM

Some User (someuser) awarded a token.Feb 4 2021, 6:42 PM

Rebased on master.

Harbormaster completed remote builds in B12761: Diff 33787.Feb 9 2021, 9:52 PM

Removed some more unneeded files.

Harbormaster completed remote builds in B12762: Diff 33789.Feb 9 2021, 9:59 PM

Incremented file subversion to 7

Harbormaster completed remote builds in B12763: Diff 33790.Feb 9 2021, 10:07 PM

Works for me. I'll land this with 10181 when that's ready.

This revision is now accepted and ready to land.Feb 10 2021, 2:17 AM

Closed by commit rB9a9e19fdcc48: Geometry Nodes: Use multi-input socket in join geometry node (authored by Fabian Schempp (fabian_schempp), committed by Hans Goudey (HooglyBoogly)). · Explain WhyFeb 11 2021, 7:23 AM

This revision was automatically updated to reflect the committed changes.

Hans Goudey (HooglyBoogly) added a commit: rB9a9e19fdcc48: Geometry Nodes: Use multi-input socket in join geometry node.

Geometry Nodes: Changes Join Geometry Node to use Multi Input Sockets
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 32599

source/blender/blenkernel/BKE_node.h

source/blender/blenkernel/intern/node.c

source/blender/blenlib/BLI_math_base.h

source/blender/blenlib/intern/math_base.c

source/blender/editors/space_node/node_intern.h

source/blender/editors/space_node/node_relationships.c

source/blender/makesdna/DNA_node_types.h

source/blender/modifiers/intern/MOD_nodes.cc

source/blender/nodes/NOD_derived_node_tree.hh

source/blender/nodes/NOD_geometry_exec.hh

source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc

source/blender/nodes/intern/derived_node_tree.cc

source/blender/nodes/intern/node_common.c

source/blender/nodes/intern/node_socket.cc

source/blender/nodes/intern/node_util.c

Geometry Nodes: Changes Join Geometry Node to use Multi Input SocketsClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 32599

source/blender/blenkernel/BKE_node.h

source/blender/blenkernel/intern/node.c

source/blender/blenlib/BLI_math_base.h

source/blender/blenlib/intern/math_base.c

source/blender/editors/space_node/node_intern.h

source/blender/editors/space_node/node_relationships.c

source/blender/makesdna/DNA_node_types.h

source/blender/modifiers/intern/MOD_nodes.cc

source/blender/nodes/NOD_derived_node_tree.hh

source/blender/nodes/NOD_geometry_exec.hh

source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc

source/blender/nodes/intern/derived_node_tree.cc

source/blender/nodes/intern/node_common.c

source/blender/nodes/intern/node_socket.cc

source/blender/nodes/intern/node_util.c

Geometry Nodes: Changes Join Geometry Node to use Multi Input Sockets
ClosedPublic
Actions

Revision Contents
Changeset List