diff options
author | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-09-02 17:45:57 +0400 |
---|---|---|
committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-09-02 17:45:57 +0400 |
commit | 79759d8368d9b1767ffa61a8506f91027a3e41a0 (patch) | |
tree | f6344ac97ed09befd909188b75511190918fa039 /source/blender/blenkernel/intern/image.c | |
parent | 1fbb859e6d2e6feb0dfdefb612f17fef675d7859 (diff) |
Fix for the BKE_image_walk_all_users function: This included a check for movie/sequence image types meant for the original use to set IMA_NEED_FRAME_RECALC flag. But the function name suggests it should be generic, so better move this filter into the callback.
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 37dacd1a328..8c0c16402da 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -2149,9 +2149,7 @@ void BKE_image_walk_all_users(const Main *mainp, void *customdata, /* texture users */ for (tex = mainp->tex.first; tex; tex = tex->id.next) { if (tex->type == TEX_IMAGE && tex->ima) { - if (ELEM(tex->ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) { - callback(tex->ima, &tex->iuser, customdata); - } + callback(tex->ima, &tex->iuser, customdata); } } @@ -2193,7 +2191,7 @@ static void image_tag_frame_recalc(Image *ima, ImageUser *iuser, void *customdat { Image *changed_image = customdata; - if (ima == changed_image) { + if (ima == changed_image && ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) { iuser->flag |= IMA_NEED_FRAME_RECALC; } } |