[Bf-blender-cvs] [383a8e519b5] soc-2021-porting-modifiers-to-nodes-remesh-voxel: - changes based on review by Jacques Lucke (JacquesLucke)

[Fabian Schempp]

Commit: 383a8e519b546c06e32caf29512572f1fe725fa9
Author: Fabian Schempp
Date:   Sat Jul 31 00:20:43 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-voxel
https://developer.blender.org/rB383a8e519b546c06e32caf29512572f1fe725fa9

- changes based on review by Jacques Lucke (JacquesLucke)

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

M	source/blender/nodes/CMakeLists.txt
M	source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc

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

diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index a2523becce5..026228c658f 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -210,7 +210,7 @@ set(SRC
   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_voxel.cc
   geometry/nodes/node_geo_transform.cc
   geometry/nodes/node_geo_triangulate.cc
   geometry/nodes/node_geo_viewer.cc
@@ -464,15 +464,18 @@ endif()
 
 if(WITH_OPENVDB)
   list(APPEND INC
-          ../../../intern/openvdb
-          )
+    ../../../intern/openvdb
+  )
+
   list(APPEND INC_SYS
-          ${OPENVDB_INCLUDE_DIRS}
-          )
+    ${OPENVDB_INCLUDE_DIRS}
+  )
+
   list(APPEND LIB
-          bf_intern_openvdb
-          ${OPENVDB_LIBRARIES}
-          )
+    bf_intern_openvdb
+    ${OPENVDB_LIBRARIES}
+  )
+
   add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
 endif()
 
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 278e5e0f0e9..dd02cb59335 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_remesh_voxel.cc
@@ -39,9 +39,13 @@ static void geo_node_remesh_voxel_exec(GeoNodeExecParams params)
   const float voxel_size = params.extract_input<float>("Voxel Size");
   const float adaptivity = params.extract_input<float>("Adaptivity");
 
-  if(geometry_set.has_mesh()){
+  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();
-    Mesh *output_mesh = BKE_mesh_remesh_voxel_to_mesh_nomain(input_mesh, voxel_size, adaptivity, 0.0f);
+
+    Mesh *output_mesh = BKE_mesh_remesh_voxel_to_mesh_nomain(
+        input_mesh, voxel_size, adaptivity, 0.0f);
     geometry_set.replace_mesh(output_mesh);
   }
   params.set_output("Geometry", std::move(geometry_set));