[Bf-blender-cvs] [21f8e75ddb6] master: fix image_changed() doing unneccessary texture updates when texture wasnt using an image

[Philipp Oeser]

Commit: 21f8e75ddb6bd5daf0ef31024ee8f7d8ac85b0f2
Author: Philipp Oeser
Date:   Fri May 3 11:18:32 2019 +0200
Branches: master
https://developer.blender.org/rB21f8e75ddb6bd5daf0ef31024ee8f7d8ac85b0f2

fix image_changed() doing unneccessary texture updates when texture wasnt
using an image

Reviewers: brecht

Differential Revision: https://developer.blender.org/D4789

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

M	source/blender/editors/render/render_update.c

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

diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c
index 3f3f98bc6e5..55353039b24 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -265,7 +265,7 @@ static void image_changed(Main *bmain, Image *ima)
 
   /* textures */
   for (tex = bmain->textures.first; tex; tex = tex->id.next) {
-    if (tex->ima == ima) {
+    if (tex->type == TEX_IMAGE && tex->ima == ima) {
       texture_changed(bmain, tex);
     }
   }