diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-18 16:45:22 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-18 18:38:17 +0300 |
| commit | 8f7ae20f799cbba7a5ce60b18efb8401328aab44 (patch) | |
| tree | 4e9bf30286d0d4ffb47fb13bd59e50fd2e54545e /source/blender/blenkernel | |
| parent | c94b3b19a2c07ce2617bf4998a1634f020660e4d (diff) | |
Cleanup: rename tpageflag to gpuflag, make it purely runtime data.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index c8d879ff813..0d5bfc5ea01 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -3188,7 +3188,7 @@ static ImBuf *load_sequence_single(Image *ima, ImageUser *iuser, int frame, cons /* XXX temp stuff? */ if (ima->lastframe != frame) - ima->tpageflag |= IMA_TPAGE_REFRESH; + ima->gpuflag |= IMA_GPU_REFRESH; ima->lastframe = frame; @@ -3912,7 +3912,7 @@ static ImBuf *image_get_cached_ibuf(Image *ima, ImageUser *iuser, int *r_frame, ibuf = image_get_cached_ibuf_for_index_frame(ima, index, frame); /* XXX temp stuff? */ if (ima->lastframe != frame) - ima->tpageflag |= IMA_TPAGE_REFRESH; + ima->gpuflag |= IMA_GPU_REFRESH; ima->lastframe = frame; } else if (ima->source == IMA_SRC_SEQUENCE) { @@ -3922,7 +3922,7 @@ static ImBuf *image_get_cached_ibuf(Image *ima, ImageUser *iuser, int *r_frame, /* XXX temp stuff? */ if (ima->lastframe != frame) { - ima->tpageflag |= IMA_TPAGE_REFRESH; + ima->gpuflag |= IMA_GPU_REFRESH; } ima->lastframe = frame; @@ -4317,11 +4317,6 @@ void BKE_image_user_frame_calc(ImageUser *iuser, int cfra) iuser->flag &= ~IMA_USER_FRAME_IN_RANGE; } - /* allows image users to handle redraws */ - if (iuser->flag & IMA_ANIM_ALWAYS) - if (framenr != iuser->framenr) - iuser->flag |= IMA_ANIM_REFRESHED; - iuser->framenr = framenr; if (iuser->ok == 0) iuser->ok = 1; } |