diff options
author | Jacques Lucke <jacques@blender.org> | 2020-12-11 14:00:48 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-12-11 14:00:48 +0300 |
commit | d72ec16e70721408c875040325c984941687b4a2 (patch) | |
tree | 9227d298f9ac7b2eb96d1e0b5fed8ba30cb50cf0 /source/blender/blenkernel | |
parent | 150a1d158a79582802bb17dacdd790f0f88aeedb (diff) |
Geometry Nodes: add Attribute Mix node
This node can be used to mix two attributes in various ways.
The blend modes are the same as in the MixRGB shader node.
Differential Revision: https://developer.blender.org/D9737
Ref T82374.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index eeef3e5c704..77a1d3989b0 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1351,6 +1351,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_ATTRIBUTE_MATH 1009 #define GEO_NODE_JOIN_GEOMETRY 1010 #define GEO_NODE_ATTRIBUTE_FILL 1011 +#define GEO_NODE_ATTRIBUTE_MIX 1012 /** \} */ diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index eeffaa186ab..61bfc09cc42 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -4697,6 +4697,7 @@ static void registerGeometryNodes(void) register_node_type_geo_random_attribute(); register_node_type_geo_attribute_math(); register_node_type_geo_join_geometry(); + register_node_type_geo_attribute_mix(); } static void registerFunctionNodes(void) |