Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2020-02-26 17:55:30 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-02-26 19:30:22 +0300
commit9dbfc7ca8bf4453c0ad0f5798405a23fe425d747 (patch)
tree946229361b38350c4452045dbf736b1b4edecd37
parent95175c3b5e2bfa223670f7abc30fe46cb3e216dd (diff)
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
-rw-r--r--source/blender/blenkernel/intern/image.c8
1 files changed, 8 insertions, 0 deletions
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;
}
}