[Bf-blender-cvs] [ffd3dd63769] master: Merge branch 'blender-v3.0-release'

[Jacques Lucke]

Commit: ffd3dd63769c8e97eceda54c8fa4067d872655be
Author: Jacques Lucke
Date:   Tue Nov 2 11:17:53 2021 +0100
Branches: master
https://developer.blender.org/rBffd3dd63769c8e97eceda54c8fa4067d872655be

Merge branch 'blender-v3.0-release'

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



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

diff --cc source/blender/blenkernel/intern/image.c
index 5d53fe3e5fe,c9ac1f32804..8472ad5d8aa
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@@ -540,12 -527,8 +538,8 @@@ void BKE_image_free_buffers_ex(Image *i
  
    BKE_image_free_gputextures(ima);
  
-   LISTBASE_FOREACH (ImageTile *, tile, &ima->tiles) {
-     tile->ok = IMA_OK;
-   }
- 
    if (do_lock) {
 -    BLI_mutex_unlock(image_mutex);
 +    BLI_mutex_unlock(ima->runtime.cache_mutex);
    }
  }
  
@@@ -5288,9 -5134,9 +5153,9 @@@ bool BKE_image_has_ibuf(Image *ima, Ima
      return false;
    }
  
 -  BLI_mutex_lock(image_mutex);
 +  BLI_mutex_lock(ima->runtime.cache_mutex);
  
-   ibuf = image_get_cached_ibuf(ima, iuser, NULL, NULL);
+   ibuf = image_get_cached_ibuf(ima, iuser, NULL, NULL, NULL);
  
    if (!ibuf) {
      ibuf = image_acquire_ibuf(ima, iuser, NULL);