Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-05-03 12:18:32 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-05-03 16:53:19 +0300
commit21f8e75ddb6bd5daf0ef31024ee8f7d8ac85b0f2 (patch)
tree1cd31bf80844618b5a72cab93c1e1ea2688b53ab /source/blender
parenta460e972123ebb08f598040b52fe0e649a5043b3 (diff)
fix image_changed() doing unneccessary texture updates when texture wasnt
using an image Reviewers: brecht Differential Revision: https://developer.blender.org/D4789
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/render/render_update.c2
1 files changed, 1 insertions, 1 deletions
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);
}
}