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 remote-tracking branch 'origin/tizen' into devel/new_mesh
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
shader-effects
/
ripple-effect.cpp
diff --git
a/dali-toolkit/public-api/shader-effects/ripple-effect.cpp
b/dali-toolkit/public-api/shader-effects/ripple-effect.cpp
index
9ebf825
..
ec354c9
100644
(file)
--- a/
dali-toolkit/public-api/shader-effects/ripple-effect.cpp
+++ b/
dali-toolkit/public-api/shader-effects/ripple-effect.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-94,7
+94,7
@@
RippleEffect RippleEffect::New()
// Create the implementation, temporarily owned on stack
Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::New(
// Create the implementation, temporarily owned on stack
Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::New(
- vertexShader, imageFragmentShader,
vertexShader, ""
, GeometryHints(HINT_GRID) );
+ vertexShader, imageFragmentShader,
GeometryType(GEOMETRY_TYPE_IMAGE)
, GeometryHints(HINT_GRID) );
/* Pass ownership to RippleEffect through overloaded constructor, So that it now has access to the
Dali::ShaderEffect implementation */
/* Pass ownership to RippleEffect through overloaded constructor, So that it now has access to the
Dali::ShaderEffect implementation */