Peter M. Groen / dali-demo

Commit 3c6c1b2687725e195b295da9c33cbca6969f1a8a

Authored by Xiangyin Ma
2 parents 9f196dc5 7c8a1db1

[dali_1.0.45] Merge branch 'devel/master' 

Change-Id: I73fe6b49c26c6bbb91b142f1e185941a12bac305
Inline Side-by-side
Showing 3 changed files with 6 additions and 10 deletions
examples/cluster/cluster-impl.cpp
  View file @3c6c1b2
... ... @@ -540,15 +540,15 @@ void Cluster::DoTransformAction(const Property::Map& attributes)
540 540  
541 541 if( Property::VECTOR3 == type && "position" == stringValue.first )
542 542 {
543   - stringValue.second.Get(position);
  543 + stringValue.second.Get( position );
544 544 }
545 545 else if( Property::VECTOR3 == type && "scale" == stringValue.first )
546 546 {
547   - stringValue.second.Get(scale);
  547 + stringValue.second.Get( scale );
548 548 }
549 549 else if( "rotation" == stringValue.first )
550 550 {
551   - (void)Scripting::SetRotation(stringValue.second, rotation);
  551 + stringValue.second.Get( rotation );
552 552 }
553 553 }
554 554  
... ...
packaging/com.samsung.dali-demo.spec
  View file @3c6c1b2
... ... @@ -2,7 +2,7 @@
2 2  
3 3 Name: com.samsung.dali-demo
4 4 Summary: The OpenGLES Canvas Core Demo
5   -Version: 1.0.44
  5 +Version: 1.0.45
6 6 Release: 1
7 7 Group: System/Libraries
8 8 License: Apache-2.0
... ...
resources/scripts/background-color.json
  View file @3c6c1b2
... ... @@ -47,9 +47,7 @@
47 47 "anchor-point": "TOP_CENTER",
48 48 "size": [400, 150, 1],
49 49 "background-image": {
50   - "image": {
51   - "filename": "{DALI_IMAGE_DIR}button-background.png"
52   - }
  50 + "filename": "{DALI_IMAGE_DIR}button-background.png"
53 51 }
54 52 },
55 53  
... ... @@ -62,9 +60,7 @@
62 60 "size": [400, 150, 1],
63 61 "background-color": [0, 0, 1, 1],
64 62 "background-image": {
65   - "image": {
66   - "filename": "{DALI_IMAGE_DIR}button-background.png"
67   - }
  63 + "filename": "{DALI_IMAGE_DIR}button-background.png"
68 64 }
69 65 }
70 66 ]
... ...