Merge branch 'master' into dev

mrdoob · mrdoob · commit c36044a4003c · 2016-05-24T11:36:46.000-07:00
diff --git a/examples/js/loaders/sea3d/SEA3DLoader.js b/examples/js/loaders/sea3d/SEA3DLoader.js
@@ -472,7 +472,7 @@ THREE.SEA3D.Animator = function( clips, mixer ) {
 
 THREE.SEA3D.Animator.prototype.update = function( dt ) {
 
-	this.mixer.update( dt );
+	this.mixer.update( dt || 0 );
 
 	if ( this.currentAnimationAction.paused ) {
 
@@ -1108,7 +1108,7 @@ THREE.SEA3D.AnimationHandler = {
 
 		var index = this.animators.indexOf( animator );
 
-		if ( index !== - 1 ) this.animators.splice( this.animators.indexOf( animator ), 1 );
+		if ( index !== - 1 ) this.animators.splice( index, 1 );
 
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ THREE.SEA3D.Animator = function( clips, mixer ) {`
`472`	`472`
`473`	`473`	`THREE.SEA3D.Animator.prototype.update = function( dt ) {`
`474`	`474`
`475`		`- this.mixer.update( dt );`
	`475`	`+ this.mixer.update( dt \|\| 0 );`
`476`	`476`
`477`	`477`	`if ( this.currentAnimationAction.paused ) {`
`478`	`478`
`@@ -1108,7 +1108,7 @@ THREE.SEA3D.AnimationHandler = {`
`1108`	`1108`
`1109`	`1109`	`var index = this.animators.indexOf( animator );`
`1110`	`1110`
`1111`		`- if ( index !== - 1 ) this.animators.splice( this.animators.indexOf( animator ), 1 );`
	`1111`	`+ if ( index !== - 1 ) this.animators.splice( index, 1 );`
`1112`	`1112`
`1113`	`1113`	`}`
`1114`	`1114`