projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Removing unused variables" into devel/master
[platform/core/uifw/dali-demo.git]
/
examples
/
reflection-demo
/
reflection-example.cpp
diff --git
a/examples/reflection-demo/reflection-example.cpp
b/examples/reflection-demo/reflection-example.cpp
index
e43147a
..
4dff874
100644
(file)
--- a/
examples/reflection-demo/reflection-example.cpp
+++ b/
examples/reflection-demo/reflection-example.cpp
@@
-256,7
+256,7
@@
ModelPtr CreateModel(
/**
* Create matching property buffer
*/
/**
* Create matching property buffer
*/
- auto vertexBuffer =
Property
Buffer::New( Property::Map()
+ auto vertexBuffer =
Vertex
Buffer::New( Property::Map()
.Add("aPosition", Property::VECTOR3 )
.Add("aNormal", Property::VECTOR3)
.Add("aTexCoord", Property::VECTOR2)
.Add("aPosition", Property::VECTOR3 )
.Add("aNormal", Property::VECTOR3)
.Add("aTexCoord", Property::VECTOR2)
@@
-625,7
+625,7
@@
private:
void OnKeyEvent( const KeyEvent& event )
{
void OnKeyEvent( const KeyEvent& event )
{
- if( event.GetState() == KeyEvent::D
own
)
+ if( event.GetState() == KeyEvent::D
OWN
)
{
if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
{
{
if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
{