Merge pull request #13560 from Mugen87/dev4

ExtrudeGeometry: Remove options material and extrudeMaterial
mrdoob · Mar 14, 2018 · 0c6c005 · 0c6c005
2 parents 490f1c1 + 717964b
commit 0c6c005
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/examples/webgl_geometry_extrude_shapes.html b/examples/webgl_geometry_extrude_shapes.html
@@ -159,8 +159,6 @@
 				var extrudeSettings = {
 					amount: 20,
 					steps: 1,
-					material: 1,
-					extrudeMaterial: 0,
 					bevelEnabled: true,
 					bevelThickness : 2,
 					bevelSize: 4,

diff --git a/examples/webgl_geometry_text.html b/examples/webgl_geometry_text.html
@@ -373,10 +373,7 @@
 
 					bevelThickness: bevelThickness,
 					bevelSize: bevelSize,
-					bevelEnabled: bevelEnabled,
-
-					material: 0,
-					extrudeMaterial: 1
+					bevelEnabled: bevelEnabled
 
 				});
 

diff --git a/examples/webgl_loader_ttf.html b/examples/webgl_loader_ttf.html
@@ -213,10 +213,7 @@
 
 					bevelThickness: bevelThickness,
 					bevelSize: bevelSize,
-					bevelEnabled: true,
-
-					material: 0,
-					extrudeMaterial: 1
+					bevelEnabled: true
 
 				});
 

diff --git a/src/geometries/ExtrudeGeometry.js b/src/geometries/ExtrudeGeometry.js
@@ -615,7 +615,7 @@ ExtrudeBufferGeometry.prototype.addShape = function ( shape, options ) {
 
 		}
 
-		scope.addGroup( start, verticesArray.length / 3 - start, options.material !== undefined ? options.material : 0 );
+		scope.addGroup( start, verticesArray.length / 3 - start, 0 );
 
 	}
 
@@ -639,7 +639,7 @@ ExtrudeBufferGeometry.prototype.addShape = function ( shape, options ) {
 		}
 
 
-		scope.addGroup( start, verticesArray.length / 3 - start, options.extrudeMaterial !== undefined ? options.extrudeMaterial : 1 );
+		scope.addGroup( start, verticesArray.length / 3 - start, 1 );
 
 
 	}