Merge pull request BabylonJS#912 from Temechon/master

Fixed bug when an animation event was accessing new animated value
rgarbina · Jan 15, 2016 · 399d1b8 · 399d1b8
2 parents 3c488a7 + 302a122
commit 399d1b8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Animations/babylon.animation.ts b/src/Animations/babylon.animation.ts
@@ -453,6 +453,9 @@
             var currentFrame = returnValue ? from + ratio % range : to;
             var currentValue = this._interpolate(currentFrame, repeatCount, this.loopMode, offsetValue, highLimitValue);
 
+            // Set value
+            this.setValue(currentValue);
+
             // Check events
             for (var index = 0; index < this._events.length; index++) {
                 if (currentFrame >= this._events[index].frame) {
@@ -472,9 +475,6 @@
                 }
             }
 
-            // Set value
-            this.setValue(currentValue);
-
             if (!returnValue) {
                 this._stopped = true;
             }