Commit: e427e4dbb125dcf4429f5a9a16d007b4dcde5c19
Author: Brecht Van Lommel
Date: Thu Dec 9 17:30:55 2021 +0100
Branches: master
https://developer.blender.org/rBe427e4dbb125dcf4429f5a9a16d007b4dcde5c19
Fix T93871: Image.has_data returns True for images that failed to load
===================================================================
M source/blender/blenkernel/intern/image.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 1c31e1be8bb..1efaa9a8c3d 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -5770,8 +5770,12 @@ bool BKE_image_has_loaded_ibuf(Image *image)
struct MovieCacheIter *iter = IMB_moviecacheIter_new(image->cache);
while (!IMB_moviecacheIter_done(iter)) {
- has_loaded_ibuf = true;
- break;
+ ImBuf *ibuf = IMB_moviecacheIter_getImBuf(iter);
+ if (ibuf != NULL) {
+ has_loaded_ibuf = true;
+ break;
+ }
+ IMB_moviecacheIter_step(iter);
}
IMB_moviecacheIter_free(iter);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
