Merge "Enable json tree dump to work with empty arrays" into devel/master

diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.cpp b/dali-toolkit/internal/builder/tree-node-manipulator.cpp
index 4357cb8..9567306 100644 (file)
--- a/dali-toolkit/internal/builder/tree-node-manipulator.cpp
+++ b/dali-toolkit/internal/builder/tree-node-manipulator.cpp
@@ -398,7 +398,7 @@ void TreeNodeManipulator::DoWrite(const TreeNode *value, std::ostream& output, i
     {
       bool groupMyChildren = false;
 
-      if( TreeNode::ARRAY == value->GetType() &&
+      if( TreeNode::ARRAY == value->GetType() && value->mFirstChild &&
           ( TreeNode::INTEGER == value->mFirstChild->GetType() ||
             TreeNode::FLOAT   == value->mFirstChild->GetType() ) )
       {