[Bf-blender-cvs] [01f79f7c93a] temp-T96710-pbvh-pixels: Remove using namespace.

Jeroen Bakker noreply at git.blender.org
Tue Apr 12 14:28:04 CEST 2022


Commit: 01f79f7c93acf441c15842f6e505f5310e169c19
Author: Jeroen Bakker
Date:   Tue Apr 12 14:02:27 2022 +0200
Branches: temp-T96710-pbvh-pixels
https://developer.blender.org/rB01f79f7c93acf441c15842f6e505f5310e169c19

Remove using namespace.

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

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

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

diff --git a/source/blender/blenkernel/intern/pbvh_pixels_seams.cc b/source/blender/blenkernel/intern/pbvh_pixels_seams.cc
index 109897a206f..2a883011cea 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels_seams.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels_seams.cc
@@ -9,7 +9,6 @@
 #include "BLI_math_geom.h"
 
 namespace blender::bke::pbvh::pixels {
-using namespace blender::bke::image;
 
 struct ExtendUVContext {
   PBVH *pbvh;
@@ -227,7 +226,7 @@ class UVSeamExtender {
   int image_buffer_width_;
 
  public:
-  explicit UVSeamExtender(ExtendUVContext &context, const ImageTileWrapper &image_tile)
+  explicit UVSeamExtender(ExtendUVContext &context, const image::ImageTileWrapper &image_tile)
       : image_buffer_width_(context.image_buffer->x)
   {
     rows.resize(context.image_buffer->y);
@@ -244,7 +243,7 @@ class UVSeamExtender {
   }
 
  private:
-  void init(ExtendUVContext &context, const ImageTileWrapper &image_tile)
+  void init(ExtendUVContext &context, const image::ImageTileWrapper &image_tile)
   {
     for (int n = 0; n < context.pbvh->totnode; n++) {
       PBVHNode &node = context.pbvh->nodes[n];
@@ -255,7 +254,7 @@ class UVSeamExtender {
     }
   }
 
-  void init(ExtendUVContext &context, PBVHNode &node, const ImageTileWrapper &image_tile)
+  void init(ExtendUVContext &context, PBVHNode &node, const image::ImageTileWrapper &image_tile)
   {
     NodeData &node_data = *static_cast<NodeData *>(node.pixels.node_data);
     UDIMTilePixels *tile_node_data = node_data.find_tile_data(image_tile);
@@ -300,7 +299,7 @@ void BKE_pbvh_pixels_fix_seams(PBVH &pbvh,
 
   ImageUser local_image_user = image_user;
   LISTBASE_FOREACH (ImageTile *, tile_data, &image.tiles) {
-    ImageTileWrapper image_tile(tile_data);
+    image::ImageTileWrapper image_tile(tile_data);
 
     local_image_user.tile = image_tile.get_tile_number();
     ImBuf *image_buffer = BKE_image_acquire_ibuf(&image, &local_image_user, nullptr);



More information about the Bf-blender-cvs mailing list