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

[platform/core/uifw/dali-core.git] / dali / internal / event / rendering / geometry-impl.cpp

diff --git a/dali/internal/event/rendering/geometry-impl.cpp b/dali/internal/event/rendering/geometry-impl.cpp
index 281ca92..45c0a37 100644 (file)
--- a/dali/internal/event/rendering/geometry-impl.cpp
+++ b/dali/internal/event/rendering/geometry-impl.cpp
@@ -39,7 +39,7 @@ GeometryPtr Geometry::New()
 std::size_t Geometry::AddVertexBuffer( PropertyBuffer& vertexBuffer )
 {
   mVertexBuffers.push_back( &vertexBuffer );
-  SceneGraph::AddVertexBufferMessage( mEventThreadServices.GetUpdateManager(), *mRenderObject, *vertexBuffer.GetRenderObject() );
+  SceneGraph::AttachVertexBufferMessage( mEventThreadServices.GetUpdateManager(), *mRenderObject, *vertexBuffer.GetRenderObject() );
   return mVertexBuffers.size() - 1u;
 }
 
@@ -68,19 +68,19 @@ void Geometry::SetIndexBuffer( const unsigned short* indices, size_t count )
   SceneGraph::SetIndexBufferMessage( mEventThreadServices.GetUpdateManager(), *mRenderObject, indexData );
 }
 
-void Geometry::SetGeometryType( Dali::Geometry::GeometryType geometryType )
+void Geometry::SetType( Dali::Geometry::Type geometryType )
 {
-  if( geometryType != mGeometryType )
+  if( geometryType != mType )
   {
     SceneGraph::SetGeometryTypeMessage(mEventThreadServices.GetUpdateManager(), *mRenderObject, geometryType );
 
-    mGeometryType = geometryType;
+    mType = geometryType;
   }
 }
 
-Dali::Geometry::GeometryType Geometry::GetGeometryType() const
+Dali::Geometry::Type Geometry::GetType() const
 {
-  return mGeometryType;
+  return mType;
 }
 
 const Render::Geometry* Geometry::GetRenderObject() const
@@ -91,14 +91,15 @@ const Render::Geometry* Geometry::GetRenderObject() const
 Geometry::Geometry()
 : mEventThreadServices( *Stage::GetCurrent() ),
   mRenderObject( NULL ),
-  mGeometryType(Dali::Geometry::TRIANGLES)
+  mType(Dali::Geometry::TRIANGLES)
 {
 }
 
 void Geometry::Initialize()
 {
   mRenderObject = new Render::Geometry();
-  AddGeometry( mEventThreadServices.GetUpdateManager(), *mRenderObject );
+  OwnerPointer< Render::Geometry > transferOwnership( mRenderObject );
+  AddGeometry( mEventThreadServices.GetUpdateManager(), transferOwnership );
 }
 
 Geometry::~Geometry()