Commit: 7fe316161170d874608d59e64ba5953176aef736
Author: Sergey Sharybin
Date: Fri Oct 3 11:27:05 2014 +0200
Branches: blender-v2.72-release
https://developer.blender.org/rB7fe316161170d874608d59e64ba5953176aef736
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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
