--- a/Renderer/Engine/SceneGraphRoot.cc	Wed Dec 21 12:32:55 2011 +0900
+++ b/Renderer/Engine/SceneGraphRoot.cc	Wed Dec 21 12:34:15 2011 +0900
@@ -502,15 +502,11 @@
             }
         }
 	/*TEST*/
-        for (int i=0; vertex_table==0; i++) {
-            printf("normal_table= %f\n", normal_table[i]);
+        for (int i=0; i<vcsum; i++) {
+            printf("vertexp = %d\n", vertexp[i]);
 	    // printf("vertex_table= %f\n", vertex_table[i]);
         } 
 
-	for (int i=0;i<vcsum;i++){
-	  printf("vertexp = %d\n",vertexp[i]);
-	}
-	
         free(vertex_table);
         free(normal_table);
 	free(texcoord_table);
@@ -578,12 +574,8 @@
   
         LIST list;
         init_list(&list);
-<<<<<<< local
+	xml_walk(cur,&s, &list);
 
-	xml_walk(this, cur,&s, &list);
-=======
-	xml_walk(cur,&s, &list);
->>>>>>> other
     }
     xmlFreeDoc(doc);
 }