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:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-10-03 13:27:05 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-10-03 13:27:05 +0400
commit502f6d538dc2c3f54d56bf4af5e27be92d21e2d6 (patch)
tree9e4accc6871a707f99ae145ff729855ecb3735ad /intern/cycles/render
parenta65451235637514abaaf2b04c5a89f14a6edd96f (diff)
Fix T41920: Changing Use Alpha settings doesn't refresh viewport properly
Diffstat (limited to 'intern/cycles/render')
-rw-r--r--intern/cycles/render/image.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 076cc3d8b63..eb2c3333c44 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -176,6 +176,10 @@ int ImageManager::add_image(const string& filename, void *builtin_data, bool ani
img->frame = frame;
img->need_load = true;
}
+ if(img->use_alpha != use_alpha) {
+ img->use_alpha = use_alpha;
+ img->need_load = true;
+ }
img->users++;
return slot;
}
@@ -219,6 +223,10 @@ int ImageManager::add_image(const string& filename, void *builtin_data, bool ani
img->frame = frame;
img->need_load = true;
}
+ if(img->use_alpha != use_alpha) {
+ img->use_alpha = use_alpha;
+ img->need_load = true;
+ }
img->users++;
return slot+tex_image_byte_start;
}