Merge changes I2dff9828,Ie3c8048a,Ib1b1d3bc into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / update / nodes / node.cpp

diff --git a/dali/internal/update/nodes/node.cpp b/dali/internal/update/nodes/node.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 189d18c..86b4864
--- a/dali/internal/update/nodes/node.cpp
+++ b/dali/internal/update/nodes/node.cpp
@@ -176,18 +176,23 @@ void Node::SetRoot(bool isRoot)
   mIsRoot = isRoot;
 }
 
-void Node::AddUniformMapping( OwnerPointer< UniformPropertyMapping >& map )
+void Node::AddUniformMapping(const UniformPropertyMapping& map)
 {
   PropertyOwner::AddUniformMapping( map );
   mRegenerateUniformMap = 2;
 }
 
-void Node::RemoveUniformMapping( const std::string& uniformName )
+void Node::RemoveUniformMapping( const ConstString& uniformName )
 {
   PropertyOwner::RemoveUniformMapping( uniformName );
   mRegenerateUniformMap = 2;
 }
 
+bool Node::IsAnimationPossible() const
+{
+  return mIsConnectedToSceneGraph;
+}
+
 void Node::PrepareRender( BufferIndex bufferIndex )
 {
   if( mRegenerateUniformMap != 0 )
@@ -199,7 +204,7 @@ void Node::PrepareRender( BufferIndex bufferIndex )
 
       for( UniformMap::SizeType i = 0, count=mUniformMaps.Count(); i<count; ++i )
       {
-        localMap.PushBack( &mUniformMaps[i] );
+        localMap.PushBack(mUniformMaps[i]);
       }
     }
     else if( mRegenerateUniformMap == 1 )