Browse Source

Mesh: Removed unused morphTargetForcedOrder.

Mr.doob 10 years ago
parent
commit
38bc1eea7d
2 changed files with 5 additions and 13 deletions
  1. 5 12
      docs/api/objects/Mesh.html
  2. 0 1
      src/objects/Mesh.js

+ 5 - 12
docs/api/objects/Mesh.html

@@ -44,29 +44,22 @@
 
 
 		<div>An instance of [page:Material], defining the object's appearance. Default is a [page:MeshBasicMaterial] with wireframe mode enabled and randomised colour.</div>
 		<div>An instance of [page:Material], defining the object's appearance. Default is a [page:MeshBasicMaterial] with wireframe mode enabled and randomised colour.</div>
 		
 		
-		<h3>[property:Array morphTargetForcedOrder]</h3>
-		
-		<div>
-		An array of indices specifying the order that the morphs will be applied. Undefined by
-		default, but reset to a blank array by [page:Mesh.updateMorphTargets updateMorphTargets].
-		</div>
-		
 		<h3>[property:Array morphTargetInfluences]</h3>
 		<h3>[property:Array morphTargetInfluences]</h3>
-		
+
 		<div>
 		<div>
 		An array of weights typically from 0-1 that specify how much of the morph is applied.
 		An array of weights typically from 0-1 that specify how much of the morph is applied.
 		Undefined by default, but reset to a blank array by [page:Mesh.updateMorphTargets updateMorphTargets].
 		Undefined by default, but reset to a blank array by [page:Mesh.updateMorphTargets updateMorphTargets].
 		</div>
 		</div>
-		
+
 		<h3>[property:Array morphTargetDictionary]</h3>
 		<h3>[property:Array morphTargetDictionary]</h3>
-		
+
 		<div>
 		<div>
 		A dictionary of morphTargets based on the morphTarget.name property.
 		A dictionary of morphTargets based on the morphTarget.name property.
 		Undefined by default, but rebuilt [page:Mesh.updateMorphTargets updateMorphTargets].
 		Undefined by default, but rebuilt [page:Mesh.updateMorphTargets updateMorphTargets].
 		</div>
 		</div>
 
 
 		<h3>[property:Integer morphTargetBase]</h3>
 		<h3>[property:Integer morphTargetBase]</h3>
-		
+
 		<div>
 		<div>
 		Specify the index of the morph that should be used as the base morph. Replaces the positions.
 		Specify the index of the morph that should be used as the base morph. Replaces the positions.
 		Undefined by default, but reset to -1 (non set) by [page:Mesh.updateMorphTargets updateMorphTargets].
 		Undefined by default, but reset to -1 (non set) by [page:Mesh.updateMorphTargets updateMorphTargets].
@@ -97,7 +90,7 @@
 		<div>
 		<div>
 		Get intersections between a casted ray and this mesh. [page:Raycaster.intersectObject] will call this method.
 		Get intersections between a casted ray and this mesh. [page:Raycaster.intersectObject] will call this method.
 		</div>
 		</div>
-		
+
 		<h3>[method:Object3D clone]([page:Object3D object])</h3>
 		<h3>[method:Object3D clone]([page:Object3D object])</h3>
 		<div>
 		<div>
 		object -- (optional) Object3D which needs to be cloned. If undefined, clone method will create a new cloned Mesh Object.
 		object -- (optional) Object3D which needs to be cloned. If undefined, clone method will create a new cloned Mesh Object.

+ 0 - 1
src/objects/Mesh.js

@@ -26,7 +26,6 @@ THREE.Mesh.prototype.updateMorphTargets = function () {
 	if ( this.geometry.morphTargets !== undefined && this.geometry.morphTargets.length > 0 ) {
 	if ( this.geometry.morphTargets !== undefined && this.geometry.morphTargets.length > 0 ) {
 
 
 		this.morphTargetBase = - 1;
 		this.morphTargetBase = - 1;
-		this.morphTargetForcedOrder = [];
 		this.morphTargetInfluences = [];
 		this.morphTargetInfluences = [];
 		this.morphTargetDictionary = {};
 		this.morphTargetDictionary = {};