[Bf-blender-cvs] [5c79a2953b8] soc-2021-porting-modifiers-to-nodes-remesh-blocks: changes based on review by Hans Goudey (HooglyBoogly)

[Fabian Schempp]

Commit: 5c79a2953b8858513d97e860660e7ba4b1d12529
Author: Fabian Schempp
Date:   Sat Jul 24 11:38:36 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-blocks
https://developer.blender.org/rB5c79a2953b8858513d97e860660e7ba4b1d12529

changes based on review by Hans Goudey (HooglyBoogly)

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

M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/geometry/CMakeLists.txt
M	source/blender/geometry/GEO_mesh_remesh_blocks.h
M	source/blender/geometry/intern/remesh_blocks.c
M	source/blender/modifiers/CMakeLists.txt
M	source/blender/modifiers/intern/MOD_remesh.c
M	source/blender/nodes/geometry/nodes/node_geo_remesh_blocks.cc

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

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 89855224a11..e8f31ae72c0 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -390,7 +390,6 @@ set(SRC
   BKE_mesh_mapping.h
   BKE_mesh_mirror.h
   BKE_mesh_remap.h
-        ../geometry/GEO_mesh_remesh_blocks.h
   BKE_mesh_remesh_voxel.h
   BKE_mesh_runtime.h
   BKE_mesh_sample.hh
diff --git a/source/blender/geometry/CMakeLists.txt b/source/blender/geometry/CMakeLists.txt
index 8437a520bda..3f2e094d285 100644
--- a/source/blender/geometry/CMakeLists.txt
+++ b/source/blender/geometry/CMakeLists.txt
@@ -13,9 +13,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
diff --git a/source/blender/geometry/GEO_mesh_remesh_blocks.h b/source/blender/geometry/GEO_mesh_remesh_blocks.h
index faae4e836ab..cd28cb25893 100644
--- a/source/blender/geometry/GEO_mesh_remesh_blocks.h
+++ b/source/blender/geometry/GEO_mesh_remesh_blocks.h
@@ -12,15 +12,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2019 by Blender Foundation
- * All rights reserved.
  */
 
 #pragma once
 
 /** \file
- * \ingroup bke
+ * \ingroup geo
  */
 
 #ifdef __cplusplus
@@ -38,7 +35,7 @@ typedef enum eRemeshBlocksMode {
   REMESH_BLOCKS_SHARP_FEATURES = 2,
 } eRemeshBlocksMode;
 
-struct Mesh *GEO_mesh_remesh_blocks_to_mesh_nomain(struct Mesh *mesh,
+struct Mesh *GEO_mesh_remesh_blocks(struct Mesh *mesh,
                                                    const char remesh_flag,
                                                    const char remesh_mode,
                                                    const float threshold,
diff --git a/source/blender/geometry/intern/remesh_blocks.c b/source/blender/geometry/intern/remesh_blocks.c
index 4de4a80f130..0fdb60fd101 100644
--- a/source/blender/geometry/intern/remesh_blocks.c
+++ b/source/blender/geometry/intern/remesh_blocks.c
@@ -12,13 +12,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2019 by Blender Foundation
- * All rights reserved.
  */
 
 /** \file
- * \ingroup bke
+ * \ingroup geo
  */
 
 #include "BKE_mesh.h"
@@ -112,7 +109,7 @@ static void dualcon_add_quad(void *output_v, const int vert_indices[4])
   output->curface++;
 }
 
-Mesh *GEO_mesh_remesh_blocks_to_mesh_nomain(Mesh *mesh,
+Mesh *GEO_mesh_remesh_blocks(Mesh *mesh,
                                             const char remesh_flag,
                                             const char remesh_mode,
                                             const float threshold,
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 89ddf8b319a..817e9657436 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -30,6 +30,7 @@ set(INC
   ../depsgraph
   ../editors/include
   ../functions
+  ../geometry
   ../makesdna
   ../makesrna
   ../nodes
@@ -129,6 +130,7 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
+  bf_geometry
 )
 
 if(WITH_ALEMBIC)
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c
index f99a3c8c406..513fa4b5f00 100644
--- a/source/blender/modifiers/intern/MOD_remesh.c
+++ b/source/blender/modifiers/intern/MOD_remesh.c
@@ -29,12 +29,13 @@
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
 
-#include "../../geometry/GEO_mesh_remesh_blocks.h"
 #include "BKE_context.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_remesh_voxel.h"
 #include "BKE_screen.h"
 
+#include "GEO_mesh_remesh_blocks.h"
+
 #include "UI_interface.h"
 #include "UI_resources.h"
 
@@ -72,7 +73,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx)
     }
   }
   else {
-    result = GEO_mesh_remesh_blocks_to_mesh_nomain(
+    result = GEO_mesh_remesh_blocks(
         mesh, rmd->flag, rmd->mode, rmd->threshold, rmd->hermite_num, rmd->scale, rmd->depth);
   }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_remesh_blocks.cc b/source/blender/nodes/geometry/nodes/node_geo_remesh_blocks.cc
index 8b8a9da9336..b5a2f781891 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_remesh_blocks.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_remesh_blocks.cc
@@ -64,7 +64,7 @@ static void geo_node_remesh_blocks_exec(GeoNodeExecParams params)
   if (geometry_set.has_mesh()) {
     Mesh *input_mesh = geometry_set.get_mesh_for_write();
 
-    Mesh *output_mesh = GEO_mesh_remesh_blocks_to_mesh_nomain(
+    Mesh *output_mesh = GEO_mesh_remesh_blocks(
         input_mesh, flag, mode, threshold, hermite_num, scale, depth);
 
     BKE_mesh_copy_parameters_for_eval(output_mesh, input_mesh);