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
Remove uniform mapping.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control-impl.cpp
diff --git
a/dali-toolkit/public-api/controls/control-impl.cpp
b/dali-toolkit/public-api/controls/control-impl.cpp
index
07d7f02
..
1d1e5b0
100644
(file)
--- a/
dali-toolkit/public-api/controls/control-impl.cpp
+++ b/
dali-toolkit/public-api/controls/control-impl.cpp
@@
-302,8
+302,7
@@
Actor CreateBackground( Actor parent, const Vector4& color, Image image = Image(
mesh.SetIndexBuffer( indexBuffer );
//Add uniforms to the shader
mesh.SetIndexBuffer( indexBuffer );
//Add uniforms to the shader
- Property::Index backgroundColorIndex = shader.RegisterProperty( "uBackgroundColor", color );
- shader.AddUniformMapping( backgroundColorIndex, "uBackgroundColor" );
+ shader.RegisterProperty( "uBackgroundColor", color );
//Create the renderer
Renderer renderer = Renderer::New( mesh, material );
//Create the renderer
Renderer renderer = Renderer::New( mesh, material );