[Bf-blender-cvs] [ccf06c1ff21] master: Fix T65780: unnecessary GPU image texture reloads after recent changes

[Brecht Van Lommel]

Commit: ccf06c1ff218971d6844b7a8e6ad021cdc90ea3d
Author: Brecht Van Lommel
Date:   Wed Jun 19 17:49:39 2019 +0200
Branches: master
https://developer.blender.org/rBccf06c1ff218971d6844b7a8e6ad021cdc90ea3d

Fix T65780: unnecessary GPU image texture reloads after recent changes

===================================================================

M	source/blender/blenkernel/intern/image.c

===================================================================

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index b90cd9f15f8..5c23987a8d9 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -4812,7 +4812,7 @@ void BKE_image_user_frame_calc(Image *ima, ImageUser *iuser, int cfra)
 
     iuser->framenr = framenr;
 
-    if (ima && ima->gpuframenr != framenr) {
+    if (ima && BKE_image_is_animated(ima) && ima->gpuframenr != framenr) {
       /* Note: a single texture and refresh doesn't really work when
        * multiple image users may use different frames, this is to
        * be improved with perhaps a GPU texture cache. */