diff options
Diffstat (limited to 'source/blender/editors')
4 files changed, 4 insertions, 5 deletions
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)) { diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index dd97a023825..08ac0d91d42 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -366,7 +366,7 @@ static void view3d_draw_bgpic(Scene *scene, ImageUser iuser = bgpic->iuser; iuser.scene = scene; /* Needed for render results. */ - BKE_image_user_frame_calc(&iuser, (int)DEG_get_ctime(depsgraph)); + BKE_image_user_frame_calc(ima, &iuser, (int)DEG_get_ctime(depsgraph)); if (ima->source == IMA_SRC_SEQUENCE && !(iuser.flag & IMA_USER_FRAME_IN_RANGE)) { ibuf = NULL; /* frame is out of range, dont show */ } |