Fixed GLTF import

tentone · Jul 3, 2017 · 6a3fc01 · 6a3fc01
1 parent 6cb7561
commit 6a3fc01
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/source/Editor.js b/source/Editor.js
@@ -1354,7 +1354,10 @@ Editor.loadGeometry = function(file, onLoad)
 					{
 						if(gltf.scene !== undefined)
 						{
-							Editor.addToScene(gltf.scene);
+							for(var i = 0; i < gltf.scene.children.length; i++)
+							{
+								Editor.addToScene(gltf.scene.children[i]);
+							}
 						}
 					});
 				}

diff --git a/source/core/objects/Scene.js b/source/core/objects/Scene.js
@@ -224,7 +224,7 @@ Scene.prototype.setFogMode = function(mode)
  */
 Scene.prototype.toJSON = function(meta)
 {
-	if(this.parent !== null && this.parent.type !== "Program")
+	if(this.parent.type !== "Program")
 	{
 		this.type = "Group";
 		console.warn("nunuStudio: Scene is not on top level serializing as Group.");