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
Merge "Text - Add the color to the vertex info." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
shader-effects
/
motion-stretch-effect.h
diff --git
a/dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h
b/dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h
index
5e43953
..
332fa48
100644
(file)
--- a/
dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h
+++ b/
dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h
@@
-188,14
+188,14
@@
inline Property::Map CreateMotionStretchEffect()
Property::Map map;
Property::Map customShader;
Property::Map map;
Property::Map customShader;
- customShader[ "vertex
-s
hader" ] = vertexSource;
- customShader[ "fragment
-s
hader" ] = fragmentSource;
+ customShader[ "vertex
S
hader" ] = vertexSource;
+ customShader[ "fragment
S
hader" ] = fragmentSource;
- customShader[ "subdivide
-grid-x
" ] = 10;
- customShader[ "subdivide
-grid-y
" ] = 10;
+ customShader[ "subdivide
GridX
" ] = 10;
+ customShader[ "subdivide
GridY
" ] = 10;
// NOTE: we must turn on alpha blending for the actor (HINT_BLENDING)
// NOTE: we must turn on alpha blending for the actor (HINT_BLENDING)
- customShader[ "hints" ] = "output
-is-t
ransparent";
+ customShader[ "hints" ] = "output
IsT
ransparent";
map[ "shader" ] = customShader;
return map;
map[ "shader" ] = customShader;
return map;