[Bf-blender-cvs] [b57ea0330cd] temp-T96710-pbvh-pixels: Remve extractor namespace.

[Jeroen Bakker]

Commit: b57ea0330cdcdc2106f4bfd04ca9133d5fc0b51e
Author: Jeroen Bakker
Date:   Tue Apr 12 10:37:40 2022 +0200
Branches: temp-T96710-pbvh-pixels
https://developer.blender.org/rBb57ea0330cdcdc2106f4bfd04ca9133d5fc0b51e

Remve extractor namespace.

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

M       source/blender/blenkernel/intern/pbvh_pixels.cc

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

diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc 
b/source/blender/blenkernel/intern/pbvh_pixels.cc
index 7bc3e1296a3..84cb3888d74 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@ -20,7 +20,7 @@
 
 #include "pbvh_intern.h"
 
-namespace blender::bke::pbvh::pixels::extractor {
+namespace blender::bke::pbvh::pixels {
 
 /** Durind debugging this check could be enabled. It will write to each image 
pixel that is covered
  * by the pbvh. */
@@ -435,10 +435,6 @@ static void update_pixels(PBVH *pbvh,
 #endif
 }
 
-}  // namespace blender::bke::pbvh::pixels::extractor
-
-namespace blender::bke::pbvh::pixels {
-
 Triangles &BKE_pbvh_pixels_triangles_get(PBVHNode &node)
 {
   BLI_assert(node.pixels.node_data != nullptr);
@@ -446,7 +442,8 @@ Triangles &BKE_pbvh_pixels_triangles_get(PBVHNode &node)
   return node_data->triangles;
 }
 
-UDIMTilePixels *BKE_pbvh_pixels_tile_data_get(PBVHNode &node, const 
image::ImageTileWrapper &image_tile)
+UDIMTilePixels *BKE_pbvh_pixels_tile_data_get(PBVHNode &node,
+                                              const image::ImageTileWrapper 
&image_tile)
 {
   BLI_assert(node.pixels.node_data != nullptr);
   NodeData *node_data = static_cast<NodeData *>(node.pixels.node_data);
@@ -485,7 +482,6 @@ void BKE_pbvh_pixels_mark_image_dirty(PBVHNode &node, Image 
&image, ImageUser &i
 }  // namespace blender::bke::pbvh::pixels
 
 extern "C" {
-using namespace blender::bke::pbvh::pixels::extractor;
 using namespace blender::bke::pbvh::pixels;
 
 void BKE_pbvh_build_pixels(PBVH *pbvh,

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs