Merge remote-tracking branch 'upstream/dev' into dev

mrdoob · Aug 4, 2017 · 1c8122b · 1c8122b
2 parents 9d6e652 + c63ee06
commit 1c8122b
Show file tree

Hide file tree

Showing 30 changed files with 1,779 additions and 1,277 deletions.
diff --git a/build/three.js b/build/three.js
diff --git a/build/three.min.js b/build/three.min.js
diff --git a/build/three.module.js b/build/three.module.js
diff --git a/docs/api/core/Layers.html b/docs/api/core/Layers.html
@@ -28,7 +28,7 @@ <h2>Constructor</h2>
 
 		<h3>[name]()</h3>
 		<div>
-		Create a new Layers object, with an initial mask set to layer 1.
+		Create a new Layers object, with an initial mask set to 1 (layer 0).
 		</div>
 
 		<h2>Properties</h2>

diff --git a/editor/js/Editor.js b/editor/js/Editor.js
@@ -347,6 +347,34 @@ Editor.prototype = {
 
 	},
 
+	getObjectMaterial: function ( object, slot ) {
+
+		var material = object.material;
+
+		if ( Array.isArray( material ) ) {
+
+			material = material[ slot ];
+
+		}
+
+		return material;
+
+	},
+
+	setObjectMaterial: function ( object, slot, newMaterial ) {
+
+		if ( Array.isArray( object.material ) ) {
+
+			object.material[ slot ] = newMaterial;
+
+		} else {
+
+			object.material = newMaterial;
+
+		}
+
+	},
+
 	//
 
 	select: function ( object ) {

diff --git a/editor/js/Loader.js b/editor/js/Loader.js
@@ -177,7 +177,7 @@ var Loader = function ( editor ) {
 					var contents = event.target.result;
 
 					var loader = new THREE.GLTF2Loader();
-					loader.parse( contents, function ( result ) {
+					loader.parse( contents, '', function ( result ) {
 
 						result.scene.name = filename;
 						editor.execute( new AddObjectCommand( result.scene ) );