[Bf-blender-cvs] [9dbfc7ca8bf] master: Fix T74225: Image (from sequence) cannot be loaded
Philipp Oeser
noreply at git.blender.org
Wed Feb 26 17:37:40 CET 2020
Commit: 9dbfc7ca8bf4453c0ad0f5798405a23fe425d747
Author: Philipp Oeser
Date: Wed Feb 26 15:55:30 2020 +0100
Branches: master
https://developer.blender.org/rB9dbfc7ca8bf4453c0ad0f5798405a23fe425d747
Fix T74225: Image (from sequence) cannot be loaded
If the current frame was not in range, the ImageTile's 'ok' was stuck at
0. Similar to the ImageUser being reset to 'ok' in
BKE_image_user_frame_calc, we now do for ImageTiles as well.
note: the crasher part of T74225 was fixed in rB5c490d437743.
Maniphest Tasks: T74225
Differential Revision: https://developer.blender.org/D6939
===================================================================
M source/blender/blenkernel/intern/image.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 7868b72e9cf..5761bec98b2 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -5180,6 +5180,14 @@ void BKE_image_user_frame_calc(Image *ima, ImageUser *iuser, int cfra)
iuser->ok = 1;
}
+ if (ima) {
+ LISTBASE_FOREACH (ImageTile *, tile, &ima->tiles) {
+ if (tile->ok == 0) {
+ tile->ok = IMA_OK;
+ }
+ }
+ }
+
iuser->flag &= ~IMA_NEED_FRAME_RECALC;
}
}
More information about the Bf-blender-cvs
mailing list