diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-08-03 20:55:12 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-08-03 20:55:12 +0300 |
| commit | 09df97e89706ff7e4015c7bab222eb9de538d4a4 (patch) | |
| tree | e2a4cf65918810961af0ad9f0ad6c568a15f0b12 /source/blender/blenkernel/intern/image.cc | |
| parent | cc12f3e0ba11b108edcefd45e0ccdf02b2a672f4 (diff) | |
| parent | 411b4ed6ed8f48794e20f5ee3209e4e8f7f3ced9 (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/blenkernel/intern/image.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/image.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index c6e711a33e0..02545f73810 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -4989,10 +4989,12 @@ static void image_editors_update_frame(Image *ima, ImageUser *iuser, void *customdata) { - int cfra = *(int *)customdata; + if (ima && BKE_image_is_animated(ima)) { + if ((iuser->flag & IMA_ANIM_ALWAYS) || (iuser->flag & IMA_NEED_FRAME_RECALC)) { + int cfra = *(int *)customdata; - if ((iuser->flag & IMA_ANIM_ALWAYS) || (iuser->flag & IMA_NEED_FRAME_RECALC)) { - BKE_image_user_frame_calc(ima, iuser, cfra); + BKE_image_user_frame_calc(ima, iuser, cfra); + } } } |