Browse Source

Merge branch 'patch-1' of https://github.com/tormozok/three.js into dev

Mr.doob 10 years ago
parent
commit
045c3bd77c
1 changed files with 6 additions and 2 deletions
  1. 6 2
      src/extras/objects/MorphBlendMesh.js

+ 6 - 2
src/extras/objects/MorphBlendMesh.js

@@ -299,8 +299,12 @@ THREE.MorphBlendMesh.prototype.update = function ( delta ) {
 
 		if ( animation.directionBackwards ) mix = 1 - mix;
 
-		this.morphTargetInfluences[ animation.currentFrame ] = mix * weight;
-		this.morphTargetInfluences[ animation.lastFrame ] = ( 1 - mix ) * weight;
+		if (animation.currentFrame !== animation.lastFrame) {
+			this.morphTargetInfluences[animation.currentFrame] = mix * weight;
+			this.morphTargetInfluences[animation.lastFrame] = ( 1 - mix ) * weight;
+		} else {
+			this.morphTargetInfluences[animation.currentFrame] = weight;
+		}
 
 	}