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_2.3.20] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
shader-effects
/
image-region-effect.cpp
diff --git
a/dali-toolkit/devel-api/shader-effects/image-region-effect.cpp
b/dali-toolkit/devel-api/shader-effects/image-region-effect.cpp
index
bab97f2
..
2d446d3
100644
(file)
--- a/
dali-toolkit/devel-api/shader-effects/image-region-effect.cpp
+++ b/
dali-toolkit/devel-api/shader-effects/image-region-effect.cpp
@@
-18,14
+18,13
@@
#include <dali-toolkit/devel-api/shader-effects/image-region-effect.h>
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/shader-effects/image-region-effect.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
namespace Dali
{
namespace Toolkit
{
namespace Dali
{
namespace Toolkit
{
-
Property::Map CreateImageRegionEffect()
{
Property::Map map;
Property::Map CreateImageRegionEffect()
{
Property::Map map;
@@
-37,6
+36,6
@@
Property::Map CreateImageRegionEffect()
return map;
}
return map;
}
-} // Toolkit
+} //
namespace
Toolkit
-} // Dali
+} //
namespace
Dali