From e4320e281fd84c454baf92bf503fd43222f48ae5 Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Sun, 26 Mar 2017 12:49:42 +0900 Subject: [PATCH] Fixed Skeleton Viewer loading with mixing multiple checked. --- .../src/com/esotericsoftware/spine/SkeletonViewer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java index 26cd88b78..b776dc98c 100644 --- a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java +++ b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java @@ -185,6 +185,7 @@ public class SkeletonViewer extends ApplicationAdapter { skeleton.updateWorldTransform(); state = new AnimationState(new AnimationStateData(skeletonData)); + state.setMultipleMixing(ui.multipleMixingCheckbox.isChecked()); state.addListener(new AnimationStateAdapter() { public void event (TrackEntry entry, Event event) { ui.toast(event.getData().getName()); @@ -702,7 +703,7 @@ public class SkeletonViewer extends ApplicationAdapter { multipleMixingCheckbox.addListener(new ChangeListener() { public void changed (ChangeEvent event, Actor actor) { - state.setMultipleMixing(multipleMixingCheckbox.isChecked()); + if (state != null) state.setMultipleMixing(multipleMixingCheckbox.isChecked()); } });