[Bf-blender-cvs] [2d6ca66b7fc] temp-T96710-pbvh-pixels: Wrapped vector in its own class.

[Jeroen Bakker]

Commit: 2d6ca66b7fc3a1f171356acb43e12c759036f58c
Author: Jeroen Bakker
Date:   Wed Apr 6 13:23:18 2022 +0200
Branches: temp-T96710-pbvh-pixels
https://developer.blender.org/rB2d6ca66b7fc3a1f171356acb43e12c759036f58c

Wrapped vector in its own class.

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

M	source/blender/blenkernel/BKE_pbvh.hh
M	source/blender/blenkernel/intern/pbvh_pixels.cc
M	source/blender/editors/sculpt_paint/sculpt_paint_image.cc

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

diff --git a/source/blender/blenkernel/BKE_pbvh.hh b/source/blender/blenkernel/BKE_pbvh.hh
index 9deedc3ecb7..cd8d0f5d9c6 100644
--- a/source/blender/blenkernel/BKE_pbvh.hh
+++ b/source/blender/blenkernel/BKE_pbvh.hh
@@ -202,6 +202,9 @@ struct PixelsPackage {
   ushort triangle_index;
 };
 
+class PixelPackages : public Vector<PixelsPackage> {
+};
+
 struct TileData {
   short tile_number;
   struct {
@@ -211,7 +214,7 @@ struct TileData {
   /* Dirty region of the tile in image space. */
   rcti dirty_region;
 
-  Vector<PixelsPackage> encoded_pixels;
+  PixelPackages packages;
 
   TileData()
   {
diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc
index f9b6ca84c5c..d9a70ffc6f3 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@ -96,7 +96,7 @@ static void extract_barycentric_pixels(TileData &tile_data,
       continue;
     }
     package.num_pixels = x - package.start_image_coordinate.x;
-    tile_data.encoded_pixels.append(package);
+    tile_data.packages.append(package);
   }
 }
 
@@ -186,13 +186,14 @@ static void do_encode_pixels(void *__restrict userdata,
 
     BKE_image_release_ibuf(image, image_buffer, nullptr);
 
-    if (tile_data.encoded_pixels.is_empty()) {
+    if (tile_data.packages.is_empty()) {
       continue;
     }
 
     tile_data.tile_number = image_tile.get_tile_number();
     node_data->tiles.append(tile_data);
   }
+
   node_data->triangles.cleanup_after_init();
   node->flag = static_cast<PBVHNodeFlags>(node->flag & ~PBVH_UpdatePixels);
 }
diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
index 23612e005fd..759339ced17 100644
--- a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
@@ -344,7 +344,7 @@ static void do_paint_pixels(void *__restrict userdata,
       continue;
     }
 
-    for (const PixelsPackage &encoded_pixels : tile_data->encoded_pixels) {
+    for (const PixelsPackage &encoded_pixels : tile_data->packages) {
       if (!triangle_brush_test_results[encoded_pixels.triangle_index]) {
         continue;
       }