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

Change-Id: If8a918599fe083be548df9943798e6e98a71750e

[dali_1.3.26] Merge branch 'devel/master'
Change-Id: If8a918599fe083be548df9943798e6e98a71750e
thothamon
2 parents 07fe2670 d9acc7fa
Showing 2 changed files with 29 additions and 4 deletions
examples/bezier-curve/bezier-curve-example.cpp
packaging/com.samsung.dali-demo.spec
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,8 +106,33 @@ public:
  
   BezierCurveExample( Application& application )
   : mApplication( application ),
-    mDuration(2.0f),
-    mGoingRight(true)
+    mControlPoint1(),
+    mControlPoint2(),
+    mControlLine1(),
+    mControlLine2(),
+    mAnimIcon1(),
+    mAnimIcon2(),
+    mDragActor(),
+    mCurve(),
+    mCoefficientLabel(),
+    mContentLayer(),
+    mGrid(),
+    mTimer(),
+    mDragAnimation(),
+    mBezierAnimation(),
+    mCurveVertices(),
+    mLine1Vertices(),
+    mLine2Vertices(),
+    mRelativeDragPoint(),
+    mLastControlPointPosition1(),
+    mLastControlPointPosition2(),
+    mPositionFactorIndex(),
+    mDuration( 2.0f ),
+    mControlPoint1Id( 0.0f ),
+    mControlPoint2Id( 0.0f ),
+    mControlPointScale( 0.5f ),
+    mControlPointZoomScale( mControlPointScale * 2.0 ),
+    mGoingRight( true )
   {
     // Connect to the Application's Init signal
     mApplication.InitSignal().Connect( this, &BezierCurveExample::Create );
@@ -2,7 +2,7 @@
  
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.3.25
+Version:    1.3.26
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0