From: Heeyong Song <heeyong.song@samsung.com>
Date: Wed, 10 Jan 2018 08:02:17 +0000 (+0900)
Subject: Not use premultiplication on load if custom shader is used
X-Git-Tag: dali_1.3.7~2^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=2fec525fee09d63f1861ce63f12719a8199984dc

Not use premultiplication on load if custom shader is used

Change-Id: Idddb7b0cbc5b151ea2554252c46dc9e789fd1975
---

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;