Merge "Merge branch 'devel/new_mesh' into devel/master" into devel/master

diff --cc dali/internal/event/actors/actor-impl.cpp
index 69710d9,04972cc..507f6fa
--- 1/dali/internal/event/actors/actor-impl.cpp
--- 2/dali/internal/event/actors/actor-impl.cpp
+++ b/dali/internal/event/actors/actor-impl.cpp
@@@ -1470,9 -1411,54 +1442,52 @@@ bool Actor::RelayoutPossible( Dimension
  
  bool Actor::RelayoutRequired( Dimension::Type dimension ) const
  {
 -  EnsureRelayoutData();
 -
 -  return mRelayoutData->relayoutEnabled && IsLayoutDirty( dimension );
 +  return mRelayoutData && mRelayoutData->relayoutEnabled && IsLayoutDirty( dimension );
  }
  
+ unsigned int Actor::AddRenderer( Renderer& renderer )
+ {
+   //TODO: MESH_REWORK : Add support for multiple renderers
+   if ( ! mAttachment )
+   {
+     mAttachment = RendererAttachment::New( GetEventThreadServices(), *mNode, renderer );
+   }
+ 
+   return 0;
+ }
+ 
+ unsigned int Actor::GetRendererCount() const
+ {
+   //TODO: MESH_REWORK : Add support for multiple renderers
+   RendererAttachment* attachment = dynamic_cast<RendererAttachment*>(mAttachment.Get());
+   return attachment ? 1u : 0u;
+ }
+ 
+ Renderer& Actor::GetRendererAt( unsigned int index )
+ {
+   //TODO: MESH_REWORK : Add support for multiple renderers
+   DALI_ASSERT_DEBUG( index == 0 && "Only one renderer is supported." );
+ 
+   //TODO: MESH_REWORK : Temporary code
+   RendererAttachment* attachment = dynamic_cast<RendererAttachment*>(mAttachment.Get());
+   DALI_ASSERT_ALWAYS( attachment && "Actor doesn't have a renderer" );
+ 
+   return attachment->GetRenderer();
+ }
+ 
+ void Actor::RemoveRenderer( Renderer& renderer )
+ {
+   //TODO: MESH_REWORK : Add support for multiple renderers
+   mAttachment = NULL;
+ }
+ 
+ void Actor::RemoveRenderer( unsigned int index )
+ {
+   //TODO: MESH_REWORK : Add support for multiple renderers
+   mAttachment = NULL;
+ }
+ 
+ 
  #ifdef DALI_DYNAMICS_SUPPORT
  
  //--------------- Dynamics ---------------

diff --cc dali/internal/event/actors/actor-impl.h
Simple merge