|
@@ -248,7 +248,7 @@ public class AnimationState {
|
|
first = true;
|
|
first = true;
|
|
alpha = alphaDip;
|
|
alpha = alphaDip;
|
|
TrackEntry dipMix = (TrackEntry)timelineDipMix[i];
|
|
TrackEntry dipMix = (TrackEntry)timelineDipMix[i];
|
|
- if (dipMix != null && dipMix.mixDuration > 0) alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
|
|
|
|
|
|
+ if (dipMix != null) alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
if (timeline instanceof RotateTimeline)
|
|
if (timeline instanceof RotateTimeline)
|
|
@@ -730,7 +730,7 @@ public class AnimationState {
|
|
for (int ii = mixingToLast; ii >= 0; ii--) {
|
|
for (int ii = mixingToLast; ii >= 0; ii--) {
|
|
TrackEntry entry = (TrackEntry)mixingTo[ii];
|
|
TrackEntry entry = (TrackEntry)mixingTo[ii];
|
|
if (!entry.hasTimeline(id)) {
|
|
if (!entry.hasTimeline(id)) {
|
|
- timelineDipMix[i] = entry;
|
|
|
|
|
|
+ if (entry.mixDuration > 0) timelineDipMix[i] = entry;
|
|
continue outer;
|
|
continue outer;
|
|
}
|
|
}
|
|
}
|
|
}
|