[Bf-blender-cvs] [6903b3414ab] newboolean: Renamed boolean to meah_boolean in BLI file names.
Howard Trickey
noreply at git.blender.org
Fri Aug 21 01:47:41 CEST 2020
Commit: 6903b3414ab9e860a77deb8b1a23b81367f05131
Author: Howard Trickey
Date: Thu Aug 20 19:46:57 2020 -0400
Branches: newboolean
https://developer.blender.org/rB6903b3414ab9e860a77deb8b1a23b81367f05131
Renamed boolean to meah_boolean in BLI file names.
===================================================================
R100 source/blender/blenlib/BLI_boolean.hh source/blender/blenlib/BLI_mesh_boolean.hh
M source/blender/blenlib/CMakeLists.txt
R099 source/blender/blenlib/intern/boolean.cc source/blender/blenlib/intern/mesh_boolean.cc
R099 source/blender/blenlib/tests/BLI_boolean_test.cc source/blender/blenlib/tests/BLI_mesh_boolean_test.cc
M source/blender/bmesh/tools/bmesh_boolean.cc
===================================================================
diff --git a/source/blender/blenlib/BLI_boolean.hh b/source/blender/blenlib/BLI_mesh_boolean.hh
similarity index 100%
rename from source/blender/blenlib/BLI_boolean.hh
rename to source/blender/blenlib/BLI_mesh_boolean.hh
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 1ad1ea1a307..f2069e484d2 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -62,7 +62,6 @@ set(SRC
intern/astar.c
intern/bitmap.c
intern/bitmap_draw_2d.c
- intern/boolean.cc
intern/boxpack_2d.c
intern/buffer.c
intern/convexhull_2d.c
@@ -105,6 +104,7 @@ set(SRC
intern/math_vector.c
intern/math_vector_inline.c
intern/memory_utils.c
+ intern/mesh_boolean.cc
intern/mesh_intersect.cc
intern/noise.c
intern/path_util.c
@@ -160,7 +160,6 @@ set(SRC
BLI_bitmap.h
BLI_bitmap_draw_2d.h
BLI_blenlib.h
- BLI_boolean.hh
BLI_boxpack_2d.h
BLI_buffer.h
BLI_color.hh
@@ -238,6 +237,7 @@ set(SRC
BLI_memory_utils.h
BLI_memory_utils.hh
BLI_mempool.h
+ BLI_mesh_boolean.hh
BLI_mesh_intersect.hh
BLI_mpq2.hh
BLI_mpq3.hh
@@ -373,7 +373,6 @@ if(WITH_GTESTS)
tests/BLI_array_store_test.cc
tests/BLI_array_test.cc
tests/BLI_array_utils_test.cc
- tests/BLI_boolean_test.cc
tests/BLI_delaunay_2d_test.cc
tests/BLI_disjoint_set_test.cc
tests/BLI_edgehash_test.cc
@@ -398,6 +397,7 @@ if(WITH_GTESTS)
tests/BLI_math_vector_test.cc
tests/BLI_memiter_test.cc
tests/BLI_memory_utils_test.cc
+ tests/BLI_mesh_boolean_test.cc
tests/BLI_mesh_intersect_test.cc
tests/BLI_multi_value_map_test.cc
tests/BLI_path_util_test.cc
diff --git a/source/blender/blenlib/intern/boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc
similarity index 99%
rename from source/blender/blenlib/intern/boolean.cc
rename to source/blender/blenlib/intern/mesh_boolean.cc
index 03bbf00bcbd..b76ff3c38a4 100644
--- a/source/blender/blenlib/intern/boolean.cc
+++ b/source/blender/blenlib/intern/mesh_boolean.cc
@@ -35,7 +35,7 @@
# include "BLI_vector.hh"
# include "BLI_vector_set.hh"
-# include "BLI_boolean.hh"
+# include "BLI_mesh_boolean.hh"
namespace blender::meshintersect {
diff --git a/source/blender/blenlib/tests/BLI_boolean_test.cc b/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc
similarity index 99%
rename from source/blender/blenlib/tests/BLI_boolean_test.cc
rename to source/blender/blenlib/tests/BLI_mesh_boolean_test.cc
index 8d22e084238..f7590cc69ff 100644
--- a/source/blender/blenlib/tests/BLI_boolean_test.cc
+++ b/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc
@@ -9,7 +9,7 @@
#include "MEM_guardedalloc.h"
#include "BLI_array.hh"
-#include "BLI_boolean.hh"
+#include "BLI_mesh_boolean.hh"
#include "BLI_map.hh"
#include "BLI_math_mpq.hh"
#include "BLI_mpq3.hh"
diff --git a/source/blender/bmesh/tools/bmesh_boolean.cc b/source/blender/bmesh/tools/bmesh_boolean.cc
index 69d8c6e6c16..e28414d7609 100644
--- a/source/blender/bmesh/tools/bmesh_boolean.cc
+++ b/source/blender/bmesh/tools/bmesh_boolean.cc
@@ -21,7 +21,7 @@
*/
#include "BLI_array.hh"
-#include "BLI_boolean.hh"
+#include "BLI_mesh_boolean.hh"
#include "BLI_math.h"
#include "BLI_math_mpq.hh"
#include "BLI_mesh_intersect.hh"
More information about the Bf-blender-cvs
mailing list