Merge branch 'devel/master' into tizen

diff --git a/examples/scene3d/scene3d-example.cpp b/examples/scene3d/scene3d-example.cpp
index db3775d..8de8503 100644 (file)
--- a/examples/scene3d/scene3d-example.cpp
+++ b/examples/scene3d/scene3d-example.cpp
@@ -151,6 +151,7 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector<Animation
 \r
   ResourceBundle                        resources;\r
   SceneDefinition                       scene;\r
+  SceneMetadata                         metaData;\r
   std::vector<AnimationGroupDefinition> animGroups;\r
   std::vector<CameraParameters>         cameraParameters;\r
   std::vector<LightParameters>          lights;\r
@@ -160,6 +161,7 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector<Animation
   LoadResult output{\r
     resources,\r
     scene,\r
+    metaData,\r
     *animations,\r
     animGroups,\r
     cameraParameters,\r

diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index 4c7c64b..706eb1e 100755 (executable)
--- a/packaging/com.samsung.dali-demo.spec
+++ b/packaging/com.samsung.dali-demo.spec
@@ -2,7 +2,7 @@
 
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    2.2.3
+Version:    2.2.4
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0