From: Bowon Ryu <bowon.ryu@samsung.com>
Date: Tue, 6 Dec 2022 06:25:57 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20221207.171517^0
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=cd477fc07807b2ca72ce1568eec114ea24743335;hp=11c757dbd14c32d180d46541731af7956021c750

Merge branch 'devel/master' into tizen
---

diff --git a/examples/scene3d/scene3d-example.cpp b/examples/scene3d/scene3d-example.cpp
index db3775d..8de8503 100644
--- 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
 
   ResourceBundle                        resources;
   SceneDefinition                       scene;
+  SceneMetadata                         metaData;
   std::vector<AnimationGroupDefinition> animGroups;
   std::vector<CameraParameters>         cameraParameters;
   std::vector<LightParameters>          lights;
@@ -160,6 +161,7 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector<Animation
   LoadResult output{
     resources,
     scene,
+    metaData,
     *animations,
     animGroups,
     cameraParameters,
diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index 4c7c64b..706eb1e 100755
--- 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