Explorar o código

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

Mr.doob %!s(int64=10) %!d(string=hai) anos
pai
achega
3af2bd598b
Modificáronse 1 ficheiros con 3 adicións e 3 borrados
  1. 3 3
      src/extras/objects/MorphBlendMesh.js

+ 3 - 3
src/extras/objects/MorphBlendMesh.js

@@ -33,8 +33,8 @@ THREE.MorphBlendMesh.prototype.createAnimation = function ( name, start, end, fp
 
 	var animation = {
 
-		startFrame: start,
-		endFrame: end,
+		start: start,
+		end: end,
 
 		length: end - start + 1,
 
@@ -280,7 +280,7 @@ THREE.MorphBlendMesh.prototype.update = function ( delta ) {
 
 		}
 
-		var keyframe = animation.startFrame + THREE.Math.clamp( Math.floor( animation.time / frameTime ), 0, animation.length - 1 );
+		var keyframe = animation.start + THREE.Math.clamp( Math.floor( animation.time / frameTime ), 0, animation.length - 1 );
 		var weight = animation.weight;
 
 		if ( keyframe !== animation.currentFrame ) {