[Bf-blender-cvs] [34ff1264706] temp-T97352-3d-texturing-seam-bleeding: Renamed watertight to image_tile_user.

[Jeroen Bakker]

Commit: 34ff12647064bbc4b3b043011af14c12408fc196
Author: Jeroen Bakker
Date:   Mon May 2 13:30:25 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding
https://developer.blender.org/rB34ff12647064bbc4b3b043011af14c12408fc196

Renamed watertight to image_tile_user.

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

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 379d47ba69a..dac1398d411 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels_seams.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels_seams.cc
@@ -246,11 +246,11 @@ Vector<PixelInfo> create_tile_bitmap(const PBVH &pbvh,
 Bitmaps create_tile_bitmap(const PBVH &pbvh, Image &image, ImageUser &image_user)
 {
   Bitmaps result;
-  ImageUser watertight = image_user;
+  ImageUser image_tile_user = image_user;
   LISTBASE_FOREACH (ImageTile *, tile_data, &image.tiles) {
     image::ImageTileWrapper image_tile(tile_data);
-    watertight.tile = image_tile.get_tile_number();
-    ImBuf *image_buffer = BKE_image_acquire_ibuf(&image, &watertight, nullptr);
+    image_tile_user.tile = image_tile.get_tile_number();
+    ImBuf *image_buffer = BKE_image_acquire_ibuf(&image, &image_tile_user, nullptr);
     if (image_buffer == nullptr) {
       continue;
     }