From 96e9caba6ef190b9f24f212d444ea60ec6defc4a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 17 Jun 2019 11:39:52 +0200 Subject: Fix T63867: image sequence not updating in Eevee animation render --- source/blender/editors/space_image/image_buttons.c | 2 +- source/blender/editors/space_image/image_ops.c | 2 +- source/blender/editors/space_image/space_image.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/space_image') diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index fb4369f5113..f1a29a1542d 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -798,7 +798,7 @@ void uiTemplateImage(uiLayout *layout, ImageUser *iuser = userptr->data; Scene *scene = CTX_data_scene(C); - BKE_image_user_frame_calc(iuser, (int)scene->r.cfra); + BKE_image_user_frame_calc(ima, iuser, (int)scene->r.cfra); uiLayoutSetContextPointer(layout, "edit_image", &imaptr); uiLayoutSetContextPointer(layout, "edit_image_user", userptr); diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 3789b6d7a6d..bdc6c394609 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1559,7 +1559,7 @@ static int image_match_len_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_CANCELLED; } iuser->frames = IMB_anim_get_duration(anim, IMB_TC_RECORD_RUN); - BKE_image_user_frame_calc(iuser, scene->r.cfra); + BKE_image_user_frame_calc(ima, iuser, scene->r.cfra); return OPERATOR_FINISHED; } diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 66a56399883..341a162c840 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -292,8 +292,7 @@ static void image_refresh(const bContext *C, ScrArea *sa) Image *ima; ima = ED_space_image(sima); - - BKE_image_user_frame_calc(&sima->iuser, scene->r.cfra); + BKE_image_user_frame_calc(ima, &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)) { -- cgit v1.2.3