[Bf-blender-cvs] [5beadc31d64] blender-v3.0-release: Fix T93871: Image.has_data returns True for images that failed to load
Brecht Van Lommel
noreply at git.blender.org
Tue Jan 11 09:00:06 CET 2022
Commit: 5beadc31d645ac8472c315de1dd5e32e86590b64
Author: Brecht Van Lommel
Date: Thu Dec 9 17:30:55 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB5beadc31d645ac8472c315de1dd5e32e86590b64
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 0530d537daf..9da11cf55d0 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -5741,8 +5741,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);
}
More information about the Bf-blender-cvs
mailing list