diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-06-10 19:07:08 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-06-10 19:07:08 +0400 |
| commit | 10932e2e9785b92f786deeec2794816a05a6fed1 (patch) | |
| tree | e28c24ce684bc8cc04d3fb26aaf3f5b56529619c | |
| parent | f6e21881f5d0f86725836391d20949fe0343bd19 (diff) | |
Fix #31778. BKE_image_user_frame_calc can be called with iuser==NULL in some circumstances now, so needs to check that.
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 157c8782523..eaf4c898b86 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -2722,15 +2722,17 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr) void BKE_image_user_frame_calc(ImageUser *iuser, int cfra, int fieldnr) { - const int framenr = BKE_image_user_frame_get(iuser, cfra, fieldnr); - - /* 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; + if (iuser) { + const int framenr = BKE_image_user_frame_get(iuser, cfra, fieldnr); + + /* 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; + } } void BKE_image_user_check_frame_calc(ImageUser *iuser, int cfra, int fieldnr) |