diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-01-13 21:59:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-13 21:59:58 +0400 |
| commit | c48c62a8314c51608e7b34ac0df474ce3fca0b02 (patch) | |
| tree | 9d7e11b5fd56937d98d02bc5f1e19ba15380950f /source/blender/render | |
| parent | 800e2283aa986c5cc57e833ef80569cf26d0de2f (diff) | |
Code Cleanup: replace checks for ima->source with BKE_image_is_animated
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/render_texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 049d7e5a732..78b222549d9 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -98,7 +98,7 @@ extern struct Render R; static void init_render_texture(Render *re, Tex *tex) { /* imap test */ - if (tex->ima && ELEM(tex->ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) { + if (tex->ima && BKE_image_is_animated(tex->ima)) { BKE_image_user_frame_calc(&tex->iuser, re ? re->r.cfra : 0, re ? re->flag & R_SEC_FIELD:0); } @@ -3622,7 +3622,7 @@ Material *RE_init_sample_material(Material *orig_mat, Scene *scene) } /* update image sequences and movies */ - if (tex->ima && ELEM(tex->ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) { + if (tex->ima && BKE_image_is_animated(tex->ima)) { BKE_image_user_check_frame_calc(&tex->iuser, (int)scene->r.cfra, 0); } } |