Increased version to V1.1.0.

Adjusted to removal of MultiMaterial.
kaisalmen · Mar 26, 2017 · b182dda · b182dda
1 parent 4756370
commit b182dda
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wwobjloader2",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "New OBJLoader utilizing web worker for three.js",
   "main": "build/WWOBJLoader.js",
   "author": "kaisalmen",

diff --git a/src/loaders/OBJLoader2.js b/src/loaders/OBJLoader2.js
@@ -958,7 +958,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/src/loaders/WWOBJLoader2.js b/src/loaders/WWOBJLoader2.js
@@ -409,10 +409,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 ) {