diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-17 23:42:40 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2021-08-17 23:42:40 +0300 |
| commit | 529a132cc90c4d266397ad170e0ae0d0bdeef0da (patch) | |
| tree | 73c30da3b161821c38772a0ff7b939e6f7a66627 /source/blender/blenkernel/intern/node.cc | |
| parent | 6e58f6b30451725d7a28623f48c93c2a15eec166 (diff) | |
| parent | fb8c049232446eee68b5a54f299176c293dec7d1 (diff) | |
Merge branch 'soc-2021-porting-modifiers-to-nodes-remesh-voxel' into soc-2021-porting-modifiers-to-nodes
# Conflicts:
# release/scripts/startup/nodeitems_builtins.py
# source/blender/blenkernel/BKE_node.h
# source/blender/blenkernel/intern/node.cc
# source/blender/nodes/CMakeLists.txt
# source/blender/nodes/NOD_geometry.h
# source/blender/nodes/NOD_static_types.h
# source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc
Diffstat (limited to 'source/blender/blenkernel/intern/node.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/node.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index c3c22a2fa28..a31c9a07668 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -5191,6 +5191,7 @@ static void registerGeometryNodes() register_node_type_geo_separate_components(); register_node_type_geo_subdivision_surface(); register_node_type_geo_switch(); + register_node_type_geo_remesh_voxel(); register_node_type_geo_remesh_blocks(); register_node_type_geo_transform(); register_node_type_geo_triangulate(); |