[Bf-blender-cvs] [fb8c0492324] soc-2021-porting-modifiers-to-nodes-remesh-voxel: Changes based on review by Hans Goudey (HooglyBoogly) and Jacques Lucke (JacquesLucke)

[Fabian Schempp]

Commit: fb8c049232446eee68b5a54f299176c293dec7d1
Author: Fabian Schempp
Date:   Sun Aug 15 02:07:29 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-voxel
https://developer.blender.org/rBfb8c049232446eee68b5a54f299176c293dec7d1

Changes based on review by Hans Goudey (HooglyBoogly) and Jacques Lucke
(JacquesLucke)

===================================================================

M	release/scripts/startup/nodeitems_builtins.py
M	source/blender/nodes/NOD_static_types.h
M	source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc

===================================================================

diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 8bbb16849d7..ad16526f887 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -553,7 +553,7 @@ geometry_node_categories = [
         NodeItem("GeometryNodeEdgeSplit"),
         NodeItem("GeometryNodeSubdivisionSurface"),
         NodeItem("GeometryNodeMeshSubdivide"),
-        NodeItem("GeometryNodeRemesh"),
+        NodeItem("GeometryNodeRemeshVoxel"),
     ]),
     GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[
         NodeItem("GeometryNodeMeshCircle"),
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index eb04f3e77ce..2656a87d9dd 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -339,7 +339,7 @@ DefNode(GeometryNode, GEO_NODE_SELECT_BY_MATERIAL, 0, "SELECT_BY_MATERIAL", Sele
 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_SWITCH, def_geo_switch, "SWITCH", Switch, "Switch", "")
-DefNode(GeometryNode, GEO_NODE_REMESH_VOXEL, 0, "REMESH_VOXEL", Remesh, "Voxel Remesh", "")
+DefNode(GeometryNode, GEO_NODE_REMESH_VOXEL, 0, "REMESH_VOXEL", RemeshVoxel, "Voxel Remesh", "")
 DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform", "")
 DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", Triangulate, "Triangulate", "")
 DefNode(GeometryNode, GEO_NODE_VIEWER, 0, "VIEWER", Viewer, "Viewer", "")
diff --git a/source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc b/source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc
index dd02cb59335..a9f5719d5f6 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc
@@ -40,12 +40,9 @@ static void geo_node_remesh_voxel_exec(GeoNodeExecParams params)
   const float adaptivity = params.extract_input<float>("Adaptivity");
 
   if (geometry_set.has_mesh()) {
-    /* Unfortunately input_mesh can't be const because
-     * BKE_mesh_remesh_voxel_to_mesh_nomain expects a non-const mesh */
-    Mesh *input_mesh = geometry_set.get_mesh_for_write();
+    const Mesh *input_mesh = geometry_set.get_mesh_for_read();
 
-    Mesh *output_mesh = BKE_mesh_remesh_voxel_to_mesh_nomain(
-        input_mesh, voxel_size, adaptivity, 0.0f);
+    Mesh *output_mesh = BKE_mesh_remesh_voxel(input_mesh, voxel_size, adaptivity, 0.0f);
     geometry_set.replace_mesh(output_mesh);
   }
   params.set_output("Geometry", std::move(geometry_set));