projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.2.16] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
filters
/
spread-filter.cpp
diff --git
a/dali-toolkit/internal/filters/spread-filter.cpp
b/dali-toolkit/internal/filters/spread-filter.cpp
index
11284c6
..
2e3729d
100644
(file)
--- a/
dali-toolkit/internal/filters/spread-filter.cpp
+++ b/
dali-toolkit/internal/filters/spread-filter.cpp
@@
-25,7
+25,7
@@
#include <dali/public-api/render-tasks/render-task-list.h>
// INTERNAL INCLUDES
#include <dali/public-api/render-tasks/render-task-list.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/visual
-factory/devel-visual-properties
.h>
+#include <dali-toolkit/devel-api/visual
s/visual-properties-devel
.h>
namespace Dali
{
namespace Dali
{
@@
-103,7
+103,7
@@
void SpreadFilter::Enable()
Property::Map customShader;
customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = SPREAD_FRAGMENT_SOURCE;
Property::Map visualMap;
Property::Map customShader;
customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = SPREAD_FRAGMENT_SOURCE;
Property::Map visualMap;
- visualMap.Insert( Toolkit::
Visual
Property::SHADER, customShader );
+ visualMap.Insert( Toolkit::
DevelVisual::
Property::SHADER, customShader );
// set SPREAD custom shader
mActorForInput.SetProperty( Toolkit::ImageView::Property::IMAGE, visualMap );
// set SPREAD custom shader
mActorForInput.SetProperty( Toolkit::ImageView::Property::IMAGE, visualMap );