diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-08-20 14:14:39 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-08-20 14:14:39 +0300 |
| commit | 00812008129bdab48d328775b09332af12118867 (patch) | |
| tree | 344723847c164ce75f9f4cff22991ce69678b57c /source/blender/nodes/CMakeLists.txt | |
| parent | 7d8c71e8003ecb4d3a7fe2483a328d3f2d184faa (diff) | |
Functions: remove multi-function network
The multi-function network system was able to compose multiple
multi-functions into a new one and to evaluate that efficiently.
This functionality was heavily used by the particle nodes prototype
a year ago. However, since then we only used multi-functions
without the need to compose them in geometry nodes.
The upcoming "fields" in geometry nodes will need a way to
compose multi-functions again. Unfortunately, the code removed
in this commit was not ideal for this different kind of function
composition. I've been working on an alternative that will be added
separately when it becomes needed.
I've had to update all the function nodes, because their interface
depended on the multi-function network data structure a bit.
The actual multi-function implementations are still the same though.
Diffstat (limited to 'source/blender/nodes/CMakeLists.txt')
| -rw-r--r-- | source/blender/nodes/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 46fb9f54bfe..8680fcee49a 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -345,11 +345,10 @@ set(SRC intern/node_common.c intern/node_exec.cc intern/node_geometry_exec.cc + intern/node_multi_function.cc intern/node_socket.cc - intern/node_tree_multi_function.cc intern/node_tree_ref.cc intern/node_util.c - intern/type_callbacks.cc intern/type_conversions.cc composite/node_composite_util.h @@ -366,13 +365,12 @@ set(SRC NOD_geometry_exec.hh NOD_geometry_nodes_eval_log.hh NOD_math_functions.hh - NOD_node_tree_multi_function.hh + NOD_multi_function.hh NOD_node_tree_ref.hh NOD_shader.h NOD_socket.h NOD_static_types.h NOD_texture.h - NOD_type_callbacks.hh NOD_type_conversions.hh intern/node_common.h intern/node_exec.h |