|
@@ -160,8 +160,13 @@ module spine {
|
|
let timelineCount = current.animation.timelines.length;
|
|
let timelineCount = current.animation.timelines.length;
|
|
let timelines = current.animation.timelines;
|
|
let timelines = current.animation.timelines;
|
|
if ((i == 0 && mix == 1) || blend == MixBlend.add) {
|
|
if ((i == 0 && mix == 1) || blend == MixBlend.add) {
|
|
- for (let ii = 0; ii < timelineCount; ii++)
|
|
|
|
|
|
+ for (let ii = 0; ii < timelineCount; ii++) {
|
|
|
|
+ // Fixes issue #302 on IOS9 where mix, blend sometimes became undefined and caused assets
|
|
|
|
+ // to sometimes stop rendering when using color correction, as their RGBA values become NaN.
|
|
|
|
+ // (https://github.com/pixijs/pixi-spine/issues/302)
|
|
|
|
+ Utils.webkit602BugfixHelper(mix, blend);
|
|
timelines[ii].apply(skeleton, animationLast, animationTime, events, mix, blend, MixDirection.mixIn);
|
|
timelines[ii].apply(skeleton, animationLast, animationTime, events, mix, blend, MixDirection.mixIn);
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
let timelineMode = current.timelineMode;
|
|
let timelineMode = current.timelineMode;
|
|
|
|
|