From aef935fd2d7d9570b3cde8c03432fbe21aaf7588 Mon Sep 17 00:00:00 2001
From: Xiangyin Ma <x1.ma@samsung.com>
Date: Wed, 11 Jun 2014 11:24:25 +0100
Subject: [PATCH] (MeshActor) Add a reference to AnimatableMesh

[problem]      AnimatableMesh get deleted before MeshActor
[solution]     Keep a reference to the AnimatableMesh so it would not be destroyed before the MeshActor object

Change-Id: Ib56bd23ddd630e4fb25f65310bd639f76a656fa3
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
---
 dali/internal/event/actors/mesh-actor-impl.cpp | 1 +
 dali/internal/event/actors/mesh-actor-impl.h   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dali/internal/event/actors/mesh-actor-impl.cpp b/dali/internal/event/actors/mesh-actor-impl.cpp
index f91bd07..74bef56 100644
--- a/dali/internal/event/actors/mesh-actor-impl.cpp
+++ b/dali/internal/event/actors/mesh-actor-impl.cpp
@@ -131,6 +131,7 @@ void MeshActor::SetMesh(Dali::Mesh mesh)
 
 void MeshActor::SetMesh(Dali::AnimatableMesh mesh)
 {
+  mAnimatableMeshHandle = mesh;
   SetMesh( GetImplementation(mesh).GetMesh() );
 
   SetInitialVolume(Vector3(1.0f, 1.0f, 1.0f));
diff --git a/dali/internal/event/actors/mesh-actor-impl.h b/dali/internal/event/actors/mesh-actor-impl.h
index d3b1020..75e9e39 100644
--- a/dali/internal/event/actors/mesh-actor-impl.h
+++ b/dali/internal/event/actors/mesh-actor-impl.h
@@ -22,7 +22,7 @@
 #include <cstddef>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/object/ref-object.h>
+#include <dali/public-api/object/handle.h>
 #include <dali/public-api/actors/mesh-actor.h>
 #include <dali/public-api/geometry/mesh.h>
 #include <dali/public-api/modeling/entity.h>
@@ -157,6 +157,8 @@ protected:
 
 private:
   Internal::MeshAttachmentPtr mMeshAttachment;
+  // To keep a reference to the AnimatableMesh so it would not be destroyed before the MeshActor object
+  Dali::Handle                mAnimatableMeshHandle;
 };
 
 } // namespace Internal
-- 
2.7.4