[dali_2.3.22] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / builder / tree-node-manipulator.cpp

diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.cpp b/dali-toolkit/internal/builder/tree-node-manipulator.cpp
index f7679fd..3f7e73e 100644 (file)
--- a/dali-toolkit/internal/builder/tree-node-manipulator.cpp
+++ b/dali-toolkit/internal/builder/tree-node-manipulator.cpp
@@ -290,9 +290,9 @@ void TreeNodeManipulator::SetType(TreeNode::NodeType type)
   {
     if(mNode->mFirstChild != NULL)
     {
-      TreeNode::NodeType type = mNode->mFirstChild->GetType();
+      TreeNode::NodeType firstChildType = mNode->mFirstChild->GetType();
 
-      if(TreeNode::FLOAT == type || TreeNode::INTEGER == type)
+      if(TreeNode::FLOAT == firstChildType || TreeNode::INTEGER == firstChildType)
       {
         // Arrays of numbers should be replaced, not appended to.
         RemoveChildren();