Paths

Table of Contentst

Differential D9737

Geometry Nodes: add Mix Attributes node
ClosedPublic
Actions

Authored by Jacques Lucke (JacquesLucke) on Dec 3 2020, 6:06 PM.

Tags

Subscribers

None

Tokens

"Love" token, awarded by kenziemac130.

Details

Reviewers

Hans Goudey (HooglyBoogly)
Simon Thommes (simonthommes)

Maniphest Tasks

T82374: Mix Attributes Node for the trees and flowers use case

Commits

rBd72ec16e7072: Geometry Nodes: add Attribute Mix node

Summary

This implements the Mix Attributes node as described in T82374.

mix_test.blend795 KBDownload

Diff Detail

Repository

Branch

temp-geometry-nodes-mix-attributes (branched from master)

Build Status

Buildable 11639
Build 11639: arc lint + arc unit

Event Timeline

Jacques Lucke (JacquesLucke) requested review of this revision.Dec 3 2020, 6:06 PM

Jacques Lucke (JacquesLucke) created this revision.

Harbormaster completed remote builds in B11547: Diff 31576.Dec 3 2020, 6:06 PM

Jacques Lucke (JacquesLucke) added a task: T82374: Mix Attributes Node for the trees and flowers use case.Dec 3 2020, 6:06 PM

Jacques Lucke (JacquesLucke) edited the summary of this revision. (Show Details)Dec 3 2020, 6:09 PM

Jacques Lucke (JacquesLucke) edited the summary of this revision. (Show Details)Dec 3 2020, 6:13 PM

Geometry Nodes: use correct category for Mix Attributes node

Harbormaster completed remote builds in B11548: Diff 31577.Dec 3 2020, 6:16 PM

Jacques Lucke (JacquesLucke) added a reviewer: Geometry Nodes.Dec 3 2020, 6:16 PM

rename node to Attribute Mix
support different input types for A and B

Harbormaster completed remote builds in B11639: Diff 31777.Dec 9 2020, 4:51 PM

Jacques Lucke (JacquesLucke) edited the summary of this revision. (Show Details)Dec 9 2020, 4:55 PM

Kenzie (kenziemac130) awarded a token.Dec 9 2020, 5:24 PM

Jacques Lucke (JacquesLucke) added a project: Geometry Nodes.Dec 10 2020, 9:50 AM

Jacques Lucke (JacquesLucke) edited reviewers, added: Hans Goudey (HooglyBoogly), Simon Thommes (simonthommes); removed: Geometry Nodes.

I tested the patch and from a user stand point it seems all good to me!

This revision is now accepted and ready to land.Dec 10 2020, 2:21 PM

Looks good to me!

source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
88	I guess this just uses the alpha from `a` then? That's a bit odd but I see this function used in similar ways elsewhere, so it's probably fine.
138	This is in a lot of nodes at this point, we should probably have some helper function like in D9819 but for attribute domains instead. No use cases for other domains yet though, so no need for it yet I guess.

Jacques Lucke (JacquesLucke) added inline comments.Dec 11 2020, 11:52 AM

source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
88	Yeah, seems so, good point though.
138	Yes, this can be added when we work more with multiple domains.

Closed by commit rBd72ec16e7072: Geometry Nodes: add Attribute Mix node (authored by Jacques Lucke (JacquesLucke)). · Explain WhyDec 11 2020, 12:01 PM

This revision was automatically updated to reflect the committed changes.

Jacques Lucke (JacquesLucke) added a commit: rBd72ec16e7072: Geometry Nodes: add Attribute Mix node.

Revision Contents
Changeset List

Path

Size

release/

scripts/

startup/

nodeitems_builtins.py

1 line

source/

blender/

blenkernel/

1 line

intern/

1 line

editors/

space_node/

14 lines

makesdna/

DNA_node_types.h

10 lines

makesrna/

intern/

42 lines

nodes/

1 line

1 line

NOD_static_types.h

1 line

geometry/

nodes/

node_geo_attribute_mix.cc

219 lines

Diff 31777

release/scripts/startup/nodeitems_builtins.py

Loading...

source/blender/blenkernel/BKE_node.h

Loading...

source/blender/blenkernel/intern/node.c

Loading...

source/blender/editors/space_node/drawnode.c

Loading...

source/blender/makesdna/DNA_node_types.h

Loading...

source/blender/makesrna/intern/rna_nodetree.c

Loading...

source/blender/nodes/CMakeLists.txt

Loading...

source/blender/nodes/NOD_geometry.h

Loading...

source/blender/nodes/NOD_static_types.h

Loading...

source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc

Loading...