[Bf-blender-cvs] [906347042db] gsoc-2021-porting-modifiers-to-nodes-solidify: - added geometry module - moved solidify to geometry module

[Fabian Schempp]

Commit: 906347042dbe9d4f160a348a63096535e280453b
Author: Fabian Schempp
Date:   Thu Jul 15 22:33:26 2021 +0200
Branches: gsoc-2021-porting-modifiers-to-nodes-solidify
https://developer.blender.org/rB906347042dbe9d4f160a348a63096535e280453b

- added geometry module
- moved solidify to geometry module

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

M	source/blender/CMakeLists.txt
M	source/blender/blenkernel/CMakeLists.txt
A	source/blender/geometry/CMakeLists.txt
R100	source/blender/blenkernel/BKE_solidifiy.h	source/blender/geometry/GEO_solidifiy.h
R099	source/blender/blenkernel/intern/solidify_nonmanifold.c	source/blender/geometry/intern/solidify_nonmanifold.c
M	source/blender/modifiers/CMakeLists.txt
M	source/blender/modifiers/intern/MOD_solidify.c
M	source/blender/nodes/CMakeLists.txt
M	source/blender/nodes/geometry/nodes/node_geo_solidify.cc

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

diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 8d18cf0ae9a..c1adb29812d 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -118,6 +118,7 @@ add_subdirectory(blenloader)
 add_subdirectory(depsgraph)
 add_subdirectory(ikplugin)
 add_subdirectory(simulation)
+add_subdirectory(geometry)
 add_subdirectory(gpu)
 add_subdirectory(imbuf)
 add_subdirectory(nodes)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 61c616a416b..2c25b940578 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -243,7 +243,6 @@ set(SRC
   intern/shrinkwrap.c
   intern/simulation.cc
   intern/softbody.c
-  intern/solidify_nonmanifold.c
   intern/sound.c
   intern/speaker.c
   intern/spline_base.cc
diff --git a/source/blender/geometry/CMakeLists.txt b/source/blender/geometry/CMakeLists.txt
new file mode 100644
index 00000000000..6ffc3ed286a
--- /dev/null
+++ b/source/blender/geometry/CMakeLists.txt
@@ -0,0 +1,40 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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
+        .
+        ../blenkernel
+        ../blenlib
+        ../makesdna
+        ../makesrna
+        ../../../intern/guardedalloc
+        )
+
+set(SRC
+        intern/solidify_nonmanifold.c
+        GEO_solidifiy.h
+        )
+
+set(LIB
+        bf_blenkernel
+        bf_blenlib
+        )
+
+blender_add_lib(bf_geometry "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
\ No newline at end of file
diff --git a/source/blender/blenkernel/BKE_solidifiy.h b/source/blender/geometry/GEO_solidifiy.h
similarity index 100%
rename from source/blender/blenkernel/BKE_solidifiy.h
rename to source/blender/geometry/GEO_solidifiy.h
diff --git a/source/blender/blenkernel/intern/solidify_nonmanifold.c b/source/blender/geometry/intern/solidify_nonmanifold.c
similarity index 99%
rename from source/blender/blenkernel/intern/solidify_nonmanifold.c
rename to source/blender/geometry/intern/solidify_nonmanifold.c
index a573d4ac590..d025a65c3bf 100644
--- a/source/blender/blenkernel/intern/solidify_nonmanifold.c
+++ b/source/blender/geometry/intern/solidify_nonmanifold.c
@@ -20,7 +20,6 @@
 
 #include "BKE_customdata.h"
 #include "BKE_mesh.h"
-#include "BKE_solidifiy.h"
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
@@ -29,6 +28,8 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 
+#include "GEO_solidifiy.h"
+
 #include "MEM_guardedalloc.h"
 
 #ifdef __GNUC__
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 9c9e90c6b78..1c6ba243560 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
@@ -128,7 +129,8 @@ set(SRC
 set(LIB
   bf_blenkernel
   bf_blenlib
-)
+  bf_geometry
+  )
 
 if(WITH_ALEMBIC)
   add_definitions(-DWITH_ALEMBIC)
diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c
index 7afbdab4eda..dc23b1f33d8 100644
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -36,7 +36,8 @@
 #include "BKE_context.h"
 #include "BKE_deform.h"
 #include "BKE_screen.h"
-#include "BKE_solidifiy.h"
+
+#include "GEO_solidifiy.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 74d6c70af3c..af0afa36717 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -33,6 +33,7 @@ set(INC
   ../bmesh
   ../depsgraph
   ../functions
+  ../geometry
   ../gpu
   ../imbuf
   ../makesdna
@@ -379,6 +380,7 @@ set(SRC
 set(LIB
   bf_bmesh
   bf_functions
+  bf_geometry
   bf_intern_sky
 )
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_solidify.cc b/source/blender/nodes/geometry/nodes/node_geo_solidify.cc
index 9cde4b560a4..197aa0a09c1 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_solidify.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_solidify.cc
@@ -15,12 +15,13 @@
  */
 
 #include "BKE_node.h"
-#include "BKE_solidifiy.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
 
+#include "GEO_solidifiy.h"
+
 #include "UI_interface.h"
 #include "UI_resources.h"