[Bf-blender-cvs] [09478756373] temp-T96710-pbvh-pixels: Remove image locking.

[Jeroen Bakker]

Commit: 09478756373c97cd6d6ad0ce08f5228abcbfe7e3
Author: Jeroen Bakker
Date:   Tue Apr 12 11:45:36 2022 +0200
Branches: temp-T96710-pbvh-pixels
https://developer.blender.org/rB09478756373c97cd6d6ad0ce08f5228abcbfe7e3

Remove image locking.

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

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

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

diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc
index 6ffa56f647b..b4f8c6f8265 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@ -395,17 +395,16 @@ void BKE_pbvh_pixels_mark_image_dirty(PBVHNode &node, Image &image, ImageUser &i
   NodeData *node_data = static_cast<NodeData *>(node.pixels.node_data);
   if (node_data->flags.dirty) {
     ImageUser local_image_user = image_user;
-    void *image_lock;
     LISTBASE_FOREACH (ImageTile *, tile, &image.tiles) {
       image::ImageTileWrapper image_tile(tile);
       local_image_user.tile = image_tile.get_tile_number();
-      ImBuf *image_buffer = BKE_image_acquire_ibuf(&image, &local_image_user, &image_lock);
+      ImBuf *image_buffer = BKE_image_acquire_ibuf(&image, &local_image_user, nullptr);
       if (image_buffer == nullptr) {
         continue;
       }
 
       node_data->mark_region(image, image_tile, *image_buffer);
-      BKE_image_release_ibuf(&image, image_buffer, image_lock);
+      BKE_image_release_ibuf(&image, image_buffer, nullptr);
     }
     node_data->flags.dirty = false;
   }
diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
index 2a4a7c45146..2c4e7553ef3 100644
--- a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
@@ -311,8 +311,6 @@ static void do_paint_pixels(void *__restrict userdata,
   PaintingKernel<ImageBufferFloat4> kernel_float4(ss, brush, thread_id, mvert);
   PaintingKernel<ImageBufferByte4> kernel_byte4(ss, brush, thread_id, mvert);
 
-  /* TODO: should we lock? */
-  void *image_lock;
   ImageUser image_user = *data->image_data.image_user;
   bool pixels_updated = false;
   LISTBASE_FOREACH (ImageTile *, tile, &data->image_data.image->tiles) {
@@ -324,7 +322,7 @@ static void do_paint_pixels(void *__restrict userdata,
       continue;
     }
 
-    ImBuf *image_buffer = BKE_image_acquire_ibuf(data->image_data.image, &image_user, &image_lock);
+    ImBuf *image_buffer = BKE_image_acquire_ibuf(data->image_data.image, &image_user, nullptr);
     if (image_buffer == nullptr) {
       continue;
     }
@@ -346,7 +344,7 @@ static void do_paint_pixels(void *__restrict userdata,
       }
     }
 
-    BKE_image_release_ibuf(data->image_data.image, image_buffer, image_lock);
+    BKE_image_release_ibuf(data->image_data.image, image_buffer, nullptr);
 
     pixels_updated |= tile_data->flags.dirty;
   }