[Bf-blender-cvs] [502f6d5] master: Fix T41920: Changing Use Alpha settings doesn't refresh viewport properly

[Sergey Sharybin]

Commit: 502f6d538dc2c3f54d56bf4af5e27be92d21e2d6
Author: Sergey Sharybin
Date:   Fri Oct 3 11:27:05 2014 +0200
Branches: master
https://developer.blender.org/rB502f6d538dc2c3f54d56bf4af5e27be92d21e2d6

Fix T41920: Changing Use Alpha settings doesn't refresh viewport properly

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

M	intern/cycles/render/image.cpp

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

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 076cc3d..eb2c333 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;
 			}