Commit: 529a132cc90c4d266397ad170e0ae0d0bdeef0da Author: Fabian Schempp Date: Tue Aug 17 22:42:40 2021 +0200 Branches: soc-2021-porting-modifiers-to-nodes_all https://developer.blender.org/rB529a132cc90c4d266397ad170e0ae0d0bdeef0da
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 =================================================================== =================================================================== diff --cc release/scripts/startup/nodeitems_builtins.py index 8c3ac752c14,ad16526f887..949307be698 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@@ -554,12 -553,7 +554,13 @@@ geometry_node_categories = NodeItem("GeometryNodeEdgeSplit"), NodeItem("GeometryNodeSubdivisionSurface"), NodeItem("GeometryNodeMeshSubdivide"), + NodeItem("GeometryNodeRemeshVoxel"), + NodeItem("GeometryNodeRemeshBlocks"), + NodeItem("GeometryNodeMeshExtrude"), + NodeItem("GeometryNodeMeshInset"), + NodeItem("GeometryNodeCollapse"), + NodeItem("GeometryNodeUnsubdivide"), + NodeItem("GeometryNodeDissolve"), ]), GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[ NodeItem("GeometryNodeMeshCircle"), diff --cc source/blender/blenkernel/BKE_node.h index 7c5853ab566,fce199e5b72..70841276dd5 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@@ -1477,14 -1477,8 +1477,15 @@@ int ntreeTexExecTree(struct bNodeTree * #define GEO_NODE_CURVE_SET_HANDLES 1072 #define GEO_NODE_CURVE_SPLINE_TYPE 1073 #define GEO_NODE_CURVE_SELECT_HANDLES 1074 + #define GEO_NODE_REMESH_VOXEL 1075 - +#define GEO_NODE_REMESH_BLOCKS 1075 +#define GEO_NODE_MERGE_BY_DISTANCE 1076 +#define GEO_NODE_MESH_EXTRUDE 1076 +#define GEO_NODE_MESH_INSET 1077 +#define GEO_NODE_CURVE_SELECT_HANDLES 1078 +#define GEO_NODE_COLLAPSE 1079 +#define GEO_NODE_UNSUBDIVIDE 1080 +#define GEO_NODE_DISSOLVE 1081 /** \} */ /* -------------------------------------------------------------------- */ diff --cc source/blender/blenkernel/intern/node.cc index c3c22a2fa28,2f5b2591384..a31c9a07668 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@@ -5191,10 -5187,9 +5191,11 @@@ 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(); + register_node_type_geo_unsubdivide(); register_node_type_geo_viewer(); register_node_type_geo_volume_to_mesh(); } diff --cc source/blender/nodes/CMakeLists.txt index 175c9744b2e,15e2b5f4619..3d026f09e79 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@@ -217,10 -212,9 +217,11 @@@ set(SR geometry/nodes/node_geo_separate_components.cc geometry/nodes/node_geo_subdivision_surface.cc geometry/nodes/node_geo_switch.cc + geometry/nodes/node_geo_remesh_voxel.cc + geometry/nodes/node_geo_remesh_blocks.cc geometry/nodes/node_geo_transform.cc geometry/nodes/node_geo_triangulate.cc + geometry/nodes/node_geo_unsubdivide.cc geometry/nodes/node_geo_viewer.cc geometry/nodes/node_geo_volume_to_mesh.cc geometry/node_geometry_exec.cc diff --cc source/blender/nodes/NOD_geometry.h index 694b5b88b94,739fe880e12..139f9421fa7 --- a/source/blender/nodes/NOD_geometry.h +++ b/source/blender/nodes/NOD_geometry.h @@@ -98,7 -94,7 +98,8 @@@ void register_node_type_geo_point_separ void register_node_type_geo_point_translate(void); void register_node_type_geo_points_to_volume(void); void register_node_type_geo_raycast(void); + void register_node_type_geo_remesh_voxel(void); +void register_node_type_geo_remesh_blocks(void); void register_node_type_geo_sample_texture(void); void register_node_type_geo_select_by_handle_type(void); void register_node_type_geo_select_by_material(void); diff --cc source/blender/nodes/NOD_static_types.h index de2fb692d7e,2656a87d9dd..c3762ebf4b7 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@@ -338,15 -335,13 +338,16 @@@ DefNode(GeometryNode, GEO_NODE_POINT_SE DefNode(GeometryNode, GEO_NODE_POINT_TRANSLATE, def_geo_point_translate, "POINT_TRANSLATE", PointTranslate, "Point Translate", "") DefNode(GeometryNode, GEO_NODE_POINTS_TO_VOLUME, def_geo_points_to_volume, "POINTS_TO_VOLUME", PointsToVolume, "Points to Volume", "") DefNode(GeometryNode, GEO_NODE_RAYCAST, def_geo_raycast, "RAYCAST", Raycast, "Raycast", "") +DefNode(GeometryNode, GEO_NODE_MERGE_BY_DISTANCE, def_geo_merge_by_distance, "MERGE_BY_DISTANCE", MergeByDistance, "Merge by Distance", "") DefNode(GeometryNode, GEO_NODE_SELECT_BY_MATERIAL, 0, "SELECT_BY_MATERIAL", SelectByMaterial, "Select by Material", "") DefNode(GeometryNode, GEO_NODE_SEPARATE_COMPONENTS, 0, "SEPARATE_COMPONENTS", SeparateComponents, "Separate Components", "") -DefNode(GeometryNode, GEO_NODE_SUBDIVISION_SURFACE, 0, "SUBDIVISION_SURFACE", SubdivisionSurface, "Subdivision Surface", "") +DefNode(GeometryNode, GEO_NODE_SUBDIVISION_SURFACE, def_geo_subdivision_surface, "SUBDIVISION_SURFACE", SubdivisionSurface, "Subdivision Surface", "") DefNode(GeometryNode, GEO_NODE_SWITCH, def_geo_switch, "SWITCH", Switch, "Switch", "") + DefNode(GeometryNode, GEO_NODE_REMESH_VOXEL, 0, "REMESH_VOXEL", RemeshVoxel, "Voxel Remesh", "") +DefNode(GeometryNode, GEO_NODE_REMESH_BLOCKS, def_geo_remesh_blocks, "REMESH_BLOCKS", RemeshBlocks, "Remesh Blocks", "") DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform", "") DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", Triangulate, "Triangulate", "") +DefNode(GeometryNode, GEO_NODE_UNSUBDIVIDE, 0, "UNSUBDIVIDE", Unsubdivide, "Unsubdivide", "") DefNode(GeometryNode, GEO_NODE_VIEWER, 0, "VIEWER", Viewer, "Viewer", "") DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "") _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs