mrdoob#9756 Updated to WWOBJLoader2 V1.1.0:

Adjusted to removal of MultiMaterial
kaisalmen · Mar 25, 2017 · 0ff805f · 0ff805f
1 parent 75de261
commit 0ff805f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/examples/js/loaders/OBJLoader.js b/examples/js/loaders/OBJLoader.js
@@ -720,8 +720,7 @@ THREE.OBJLoader.prototype = {
 
 				}
 
-				var multiMaterial = new THREE.MultiMaterial( createdMaterials );
-				mesh = ( ! isLine ? new THREE.Mesh( buffergeometry, multiMaterial ) : new THREE.LineSegments( buffergeometry, multiMaterial ) );
+				mesh = ( ! isLine ? new THREE.Mesh( buffergeometry, createdMaterials ) : new THREE.LineSegments( buffergeometry, createdMaterials ) );
 
 			} else {
 

diff --git a/examples/js/loaders/OBJLoader2.js b/examples/js/loaders/OBJLoader2.js
@@ -6,7 +6,7 @@
 'use strict';
 
 if ( THREE.OBJLoader2 === undefined ) { THREE.OBJLoader2 = {} }
-THREE.OBJLoader2.version = '1.0.6';
+THREE.OBJLoader2.version = '1.1.0';
 
 /**
  * Use this class to load OBJ data from files or to parse OBJ data from arraybuffer or text
@@ -965,7 +965,7 @@ THREE.OBJLoader2 = (function () {
 			}
 			if ( ! normalBA ) bufferGeometry.computeVertexNormals();
 
-			if ( createMultiMaterial ) material = new THREE.MultiMaterial( materials );
+			if ( createMultiMaterial ) material = materials;
 			var mesh = new THREE.Mesh( bufferGeometry, material );
 			this.sceneGraphBaseNode.add( mesh );
 

diff --git a/examples/js/loaders/WWOBJLoader2.js b/examples/js/loaders/WWOBJLoader2.js
@@ -6,7 +6,7 @@
 'use strict';
 
 if ( THREE.OBJLoader2 === undefined ) { THREE.OBJLoader2 = {} }
-THREE.OBJLoader2.version = '1.0.6';
+THREE.OBJLoader2.version = '1.1.0';
 
 /**
  * OBJ data will be loaded by dynamically created web worker.
@@ -416,10 +416,9 @@ THREE.OBJLoader2.WWOBJLoader2 = (function () {
 					if ( createMultiMaterial ) multiMaterials.push( material );
 
 				}
-
 				if ( createMultiMaterial ) {
 
-					material = new THREE.MultiMaterial( multiMaterials );
+					material = multiMaterials;
 					var materialGroups = payload.materialGroups;
 					var materialGroup;
 					for ( var key in materialGroups ) {