diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-18 15:23:49 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-18 18:52:01 +0300 |
| commit | 0e3a2acbfa6998b3a1ec967f3c25f7e12e0cf8fb (patch) | |
| tree | dde289c6fbe219951ae5618866b33dfcfa3325e4 /source/blender/editors/space_image | |
| parent | 286c34b4abb0436fb370c8d49fd73738dabc0fcf (diff) | |
Fix T57457: animated image sequences not working in Eevee.
The dependency graph now handles updating image users to point to the current
frame, and tags images to be refreshed on the GPU. The image editor user is
still updated outside of the dependency graph.
We still do not support multiple image users using a different current frame
in the same image, same as 2.7. This may require adding a GPU image texture
cache to keep memory usage under control. Things like rendering an animation
while the viewport stays fixed at the current frame works though.
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/image_buttons.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index f2185c2a3d2..b77c08736dc 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -857,7 +857,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char ima = imaptr.data; iuser = userptr->data; - BKE_image_user_check_frame_calc(iuser, (int)scene->r.cfra); + BKE_image_user_frame_calc(iuser, (int)scene->r.cfra); cb = MEM_callocN(sizeof(RNAUpdateCb), "RNAUpdateCb"); cb->ptr = *ptr; @@ -1242,6 +1242,7 @@ void uiTemplateImageLayers(uiLayout *layout, bContext *C, Image *ima, ImageUser void uiTemplateImageInfo(uiLayout *layout, bContext *C, Image *ima, ImageUser *iuser) { + Scene *scene = CTX_data_scene(C); ImBuf *ibuf; char str[MAX_IMAGE_INFO_LEN]; void *lock; @@ -1251,7 +1252,8 @@ void uiTemplateImageInfo(uiLayout *layout, bContext *C, Image *ima, ImageUser *i ibuf = BKE_image_acquire_ibuf(ima, iuser, &lock); - image_info(CTX_data_scene(C), iuser, ima, ibuf, str, MAX_IMAGE_INFO_LEN); + BKE_image_user_frame_calc(iuser, (int)scene->r.cfra); + image_info(scene, iuser, ima, ibuf, str, MAX_IMAGE_INFO_LEN); BKE_image_release_ibuf(ima, ibuf, lock); uiItemL(layout, str, ICON_NONE); } diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 0cac6360205..9171b923bad 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -335,7 +335,7 @@ static void image_refresh(const bContext *C, ScrArea *sa) ima = ED_space_image(sima); - BKE_image_user_check_frame_calc(&sima->iuser, scene->r.cfra); + BKE_image_user_frame_calc(&sima->iuser, scene->r.cfra); /* check if we have to set the image from the editmesh */ if (ima && (ima->source == IMA_SRC_VIEWER && sima->mode == SI_MODE_MASK)) { |