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

mrdoob · mrdoob · commit 045c3bd77cde · 2015-08-21T00:06:32.000-07:00
diff --git a/src/extras/objects/MorphBlendMesh.js b/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;
+		}
 
 	}
 
