Merge "Simplifying UniformMap updating" into devel/master

diff --cc dali/internal/update/rendering/scene-graph-renderer.h
index 655572d,746ef1e..05ea4c6
--- 1/dali/internal/update/rendering/scene-graph-renderer.h
--- 2/dali/internal/update/rendering/scene-graph-renderer.h
+++ b/dali/internal/update/rendering/scene-graph-renderer.h
@@@ -477,16 -452,23 +452,24 @@@ private
    Renderer();
  
  private:
-   CollectedUniformMap mCollectedUniformMap[2]; ///< Uniform maps collected by the renderer
+   enum Decay
+   {
+     DONE    = 0,
+     LAST    = 1,
+     INITIAL = 2
+   };
+ 
+ private:
+   CollectedUniformMap mCollectedUniformMap; ///< Uniform maps collected by the renderer
  
 -  SceneController*                            mSceneController;           ///< Used for initializing renderers
 -  Render::Renderer*                           mRenderer;                  ///< Raw pointer to the renderer (that's owned by RenderManager)
 -  TextureSet*                                 mTextureSet;                ///< The texture set this renderer uses. (Not owned)
 -  Render::Geometry*                           mGeometry;                  ///< The geometry this renderer uses. (Not owned)
 -  Shader*                                     mShader;                    ///< The shader this renderer uses. (Not owned)
 -  VisualRenderer::AnimatableVisualProperties* mVisualProperties{nullptr}; ///< VisualProperties (optional/owned)
 -  OwnerPointer<Vector4>                       mBlendColor;                ///< The blend color for blending operation
 +  SceneController*  mSceneController; ///< Used for initializing renderers
 +  Render::Renderer* mRenderer;        ///< Raw pointer to the renderer (that's owned by RenderManager)
 +  TextureSet*       mTextureSet;      ///< The texture set this renderer uses. (Not owned)
 +  Render::Geometry* mGeometry;        ///< The geometry this renderer uses. (Not owned)
 +  Shader*           mShader;          ///< The shader this renderer uses. (Not owned)
 +
 +  OwnerPointer<VisualRenderer::AnimatableVisualProperties> mVisualProperties{nullptr}; ///< VisualProperties (optional/owned)
 +  OwnerPointer<Vector4>                                    mBlendColor;                ///< The blend color for blending operation
  
    Dali::Internal::Render::Renderer::StencilParameters mStencilParameters; ///< Struct containing all stencil related options