From af9c37d441b14b9e59edcac9aa0540718f38b21e Mon Sep 17 00:00:00 2001 From: "taeyoon0.lee" Date: Mon, 20 Feb 2017 21:30:38 +0900 Subject: [PATCH] [3.0] Modified custom shader part for native image - Fixed issue, custom shader isn't applied after changed to visual Change-Id: Idd5c2eba75db78fa7974e780c80b72d5b3f7ac5b --- dali-toolkit/internal/visuals/image/image-visual.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 4bc0d02..f3d4feb 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -296,13 +296,6 @@ void ImageVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap ) } } - NativeImage nativeImage = NativeImage::DownCast( mImage ); - - if( nativeImage ) - { - SetNativeFragmentShaderCode( nativeImage ); - } - // if actor is on stage, create new renderer and apply to actor if( actor && actor.OnStage() ) { @@ -562,6 +555,13 @@ void ImageVisual::InitializeRenderer( const Image& image ) { mImpl->mFlags &= ~Impl::IS_FROM_CACHE; + NativeImage nativeImage = NativeImage::DownCast( image ); + + if( nativeImage ) + { + SetNativeFragmentShaderCode( nativeImage ); + } + mImpl->mRenderer = CreateRenderer(); if( image ) -- 2.7.4