Changed SceneGraph::Renderer::mOnStage flag to instead count the number of connection...

This fixes a bug where multiple actors share a renderer causes multiple connections/discconections.

Change-Id: I75a14ac350fb46e72da7fcaa85ba9ec8324d9e62

diff --git a/dali/internal/event/rendering/renderer-impl.cpp b/dali/internal/event/rendering/renderer-impl.cpp
index 1b31b59..c665e3a 100644 (file)
--- a/dali/internal/event/rendering/renderer-impl.cpp
+++ b/dali/internal/event/rendering/renderer-impl.cpp
@@ -230,29 +230,35 @@ int Renderer::GetPropertyComponentIndex( Property::Index index ) const
 
 bool Renderer::OnStage() const
 {
-  return mOnStage;
+  return mOnStageCount > 0;
 }
 
 void Renderer::Connect()
 {
-  OnStageConnectMessage( GetEventThreadServices(), *mSceneObject );
-  mGeometryConnector.OnStageConnect();
-  mMaterialConnector.OnStageConnect();
-  mOnStage = true;
+  if( mOnStageCount == 0 )
+  {
+    OnStageConnectMessage( GetEventThreadServices(), *mSceneObject );
+    mGeometryConnector.OnStageConnect();
+    mMaterialConnector.OnStageConnect();
+  }
+  ++mOnStageCount;
 }
 
 void Renderer::Disconnect()
 {
-  OnStageDisconnectMessage( GetEventThreadServices(), *mSceneObject);
-  mGeometryConnector.OnStageDisconnect();
-  mMaterialConnector.OnStageDisconnect();
-  mOnStage = false;
+  --mOnStageCount;
+  if( mOnStageCount == 0 )
+  {
+    OnStageDisconnectMessage( GetEventThreadServices(), *mSceneObject);
+    mGeometryConnector.OnStageDisconnect();
+    mMaterialConnector.OnStageDisconnect();
+  }
 }
 
 Renderer::Renderer()
 : mSceneObject(NULL),
   mDepthIndex(0),
-  mOnStage(false)
+  mOnStageCount(0)
 {
 }
 

diff --git a/dali/internal/event/rendering/renderer-impl.h b/dali/internal/event/rendering/renderer-impl.h
index 77da3c6..50b57a8 100644 (file)
--- a/dali/internal/event/rendering/renderer-impl.h
+++ b/dali/internal/event/rendering/renderer-impl.h
@@ -210,7 +210,7 @@ private: // data
   ObjectConnector<Geometry> mGeometryConnector; ///< Connector that holds the geometry used by this renderer
   ObjectConnector<Material> mMaterialConnector; ///< Connector that holds the material used by this renderer
   int mDepthIndex;
-  bool mOnStage;
+  int mOnStageCount;
 };
 
 } // namespace Internal