X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fimage-atlas%2Fatlas-packer.cpp;h=b061ec5d0c9d107d68d13907d3dce11ac3ac36ee;hp=7178741615c3d5f3271b0927b8c42d488b66a5bf;hb=1ed659ce73f4ac73eaf7aab64abbb2a8e38fa20c;hpb=a4246093982a7c45fd622253d8245e447878a1af

diff --git a/dali-toolkit/internal/image-atlas/atlas-packer.cpp b/dali-toolkit/internal/image-atlas/atlas-packer.cpp
index 7178741..b061ec5 100644
--- a/dali-toolkit/internal/image-atlas/atlas-packer.cpp
+++ b/dali-toolkit/internal/image-atlas/atlas-packer.cpp
@@ -176,12 +176,12 @@ void AtlasPacker::MergeToNonOccupied( Node* node )
   node->occupied = false;
   Node* parent = node->parent;
   // both child are not occupied, merge the space to parent
-  if( parent !=NULL && parent->child[0]->occupied == false && parent->child[1]->occupied == false)
+  if( parent != NULL && parent->child[0]->occupied == false && parent->child[1]->occupied == false)
   {
     delete parent->child[0];
     parent->child[0] = NULL;
     delete parent->child[1];
-    parent->child[0] = NULL;
+    parent->child[1] = NULL;
 
     MergeToNonOccupied( parent );
   }