[Bf-blender-cvs] [fc816de31fa] temp-T97352-3d-texturing-seam-bleeding-b2: Move BKE_uv_islands to pbvh namespace.

[Jeroen Bakker]

Commit: fc816de31faed78a27d689f2dd090001eeeb275c
Author: Jeroen Bakker
Date:   Mon Sep 26 14:59:20 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rBfc816de31faed78a27d689f2dd090001eeeb275c

Move BKE_uv_islands to pbvh namespace.

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

M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/intern/pbvh_pixels.cc
R099	source/blender/blenkernel/intern/uv_islands.cc	source/blender/blenkernel/intern/pbvh_uv_islands.cc
R098	source/blender/blenkernel/BKE_uv_islands.hh	source/blender/blenkernel/intern/pbvh_uv_islands.hh

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

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 8a335172949..e4bc70987d0 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -251,6 +251,7 @@ set(SRC
   intern/pbvh.cc
   intern/pbvh_bmesh.c
   intern/pbvh_pixels.cc
+  intern/pbvh_uv_islands.cc
   intern/pointcache.c
   intern/pointcloud.cc
   intern/preferences.c
@@ -295,7 +296,6 @@ set(SRC
   intern/type_conversions.cc
   intern/undo_system.c
   intern/unit.c
-  intern/uv_islands.cc
   intern/vfont.c
   intern/vfontdata_freetype.c
   intern/volume.cc
diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc
index 60272d08a34..2f65f6b02ab 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@ -16,11 +16,11 @@
 #include "BLI_task.h"
 
 #include "BKE_image_wrappers.hh"
-#include "BKE_uv_islands.hh"
 
 #include "bmesh.h"
 
 #include "pbvh_intern.h"
+#include "pbvh_uv_islands.hh"
 
 namespace blender::bke::pbvh::pixels {
 
diff --git a/source/blender/blenkernel/intern/uv_islands.cc b/source/blender/blenkernel/intern/pbvh_uv_islands.cc
similarity index 99%
rename from source/blender/blenkernel/intern/uv_islands.cc
rename to source/blender/blenkernel/intern/pbvh_uv_islands.cc
index 8efd69e0a86..4c9b52ac958 100644
--- a/source/blender/blenkernel/intern/uv_islands.cc
+++ b/source/blender/blenkernel/intern/pbvh_uv_islands.cc
@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "BKE_uv_islands.hh"
+#include "pbvh_uv_islands.hh"
 
 #include <optional>
 
-namespace blender::bke::uv_islands {
+namespace blender::bke::pbvh::uv_islands {
 
 static void uv_edge_append_to_uv_vertices(UVEdge &uv_edge)
 {
@@ -1466,4 +1466,4 @@ bool UVIslandsMask::is_masked(const uint16_t island_index, const float2 uv) cons
 
 /** \} */
 
-}  // namespace blender::bke::uv_islands
+}  // namespace blender::bke::pbvh::uv_islands
diff --git a/source/blender/blenkernel/BKE_uv_islands.hh b/source/blender/blenkernel/intern/pbvh_uv_islands.hh
similarity index 98%
rename from source/blender/blenkernel/BKE_uv_islands.hh
rename to source/blender/blenkernel/intern/pbvh_uv_islands.hh
index a3a49d019df..78250c6e840 100644
--- a/source/blender/blenkernel/BKE_uv_islands.hh
+++ b/source/blender/blenkernel/intern/pbvh_uv_islands.hh
@@ -27,7 +27,7 @@
 
 #include "DNA_meshdata_types.h"
 
-namespace blender::bke::uv_islands {
+namespace blender::bke::pbvh::uv_islands {
 
 struct MeshEdge;
 struct MeshPrimitive;
@@ -324,4 +324,4 @@ struct UVIslandsMask {
   void dilate(int max_iterations);
 };
 
-}  // namespace blender::bke::uv_islands
+}  // namespace blender::bke::pbvh::uv_islands