Merge "Fix for the cursor position with the arabic script." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / filters / blur-two-pass-filter.cpp

diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp
index 1b3a5f1..b1dce92 100644 (file)
--- a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp
+++ b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,8 @@
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/property-map.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/devel-api/rendering/renderer.h>
-
-// INTERNAL INCLUDES
+#include <dali/public-api/rendering/renderer.h>
+#include <dali/devel-api/images/texture-set-image.h>
 
 namespace Dali
 {
@@ -184,16 +183,8 @@ void BlurTwoPassFilter::Enable()
   mRootActor.Add( mActorForBlending );
 
   // Add effect texture to blend-two-image custom shader
-  Material material = mActorForBlending.GetRendererAt(0).GetMaterial();
-  int textureIndex = material.GetTextureIndex( EFFECT_IMAGE_NAME );
-  if( textureIndex == -1 )
-  {
-    material.AddTexture( mInputImage, EFFECT_IMAGE_NAME );
-  }
-  else
-  {
-    material.SetTextureImage( textureIndex, mInputImage );
-  }
+  TextureSet textureSet = mActorForBlending.GetRendererAt(0).GetTextures();
+  TextureSetImage( textureSet, 1u, mInputImage );
 
   SetupCamera();
   CreateRenderTasks();