Browse Source

Editor: Fixed scene loading.

Mr.doob 12 years ago
parent
commit
bbf2ee3e6d
3 changed files with 6 additions and 4 deletions
  1. 2 2
      editor/js/Editor.js
  2. 2 2
      editor/js/Loader.js
  3. 2 0
      editor/js/Sidebar.Attributes.js

+ 2 - 2
editor/js/Editor.js

@@ -30,7 +30,7 @@ Editor.prototype = {
 
     if ( scene ) {
 
-      this.scene.name = scene.name ? scene.name : 'Scene';
+      this.scene.name = scene.name;
       this.scene.userData = JSON.parse( JSON.stringify( scene.userData ) );
 
       if ( scene.children.length ) this.addObject( scene.children );
@@ -1097,4 +1097,4 @@ Editor.prototype = {
 
   }
 
-}
+}

+ 2 - 2
editor/js/Loader.js

@@ -123,7 +123,7 @@ var Loader = function ( editor, signals ) {
 					break;
 
 				default:
-					console.log( 'Loading Object format 4.2');				
+					console.log( 'Loading Object format 4.2');
 					loader = new THREE.ObjectLoader();
 					break;
 
@@ -133,7 +133,7 @@ var Loader = function ( editor, signals ) {
 
 			if ( result instanceof THREE.Scene ) {
 
-				editor.addObject( result.children );
+				editor.setScene( result );
 
 			} else {
 

+ 2 - 0
editor/js/Sidebar.Attributes.js

@@ -302,6 +302,8 @@ Sidebar.Attributes = function ( signals ) {
 
       for ( var key in model ) {
 
+        if ( param[ key ] === undefined ) continue;
+
         // Params from multiOptions
 
         for ( var i in multiOptions ) {