From 2fec525fee09d63f1861ce63f12719a8199984dc Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Wed, 10 Jan 2018 17:02:17 +0900 Subject: [PATCH] Not use premultiplication on load if custom shader is used Change-Id: Idddb7b0cbc5b151ea2554252c46dc9e789fd1975 --- dali-toolkit/internal/visuals/image/image-visual.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index d9ea9cd..e010b4f 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -779,7 +779,7 @@ void ImageVisual::LoadTexture( bool& atlasing, Vector4& atlasRect, TextureSet& t atlasUploadObserver = this; } - auto preMultiplyOnLoad = mFactoryCache.GetPreMultiplyOnLoad() + auto preMultiplyOnLoad = mFactoryCache.GetPreMultiplyOnLoad() && !mImpl->mCustomShader ? TextureManager::MultiplyOnLoad::MULTIPLY_ON_LOAD : TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; -- 2.7.4