From 62ef2ba370e7b59c2dc18a121d766d58e8a7dfab Mon Sep 17 00:00:00 2001
From: badlogic <badlogicgames@gmail.com>
Date: Fri, 23 Feb 2018 16:24:35 +0100
Subject: [PATCH] [cpp] Fixed up Triangulator and AnimationState.

---
 .../spine-cpp/src/spine/AnimationState.cpp    | 23 +++++++------------
 .../spine-cpp/src/spine/Triangulator.cpp      |  2 +-
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp
index 0f0c04e5a..3a8de4d0e 100644
--- a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp
+++ b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp
@@ -132,42 +132,36 @@ namespace Spine {
     }
     
     TrackEntry* TrackEntry::setTimelineData(TrackEntry* to, Vector<TrackEntry*>& mixingToArray, Vector<int>& propertyIDs) {
-        if (to != NULL) {
-            mixingToArray.add(to);
-        }
-        
+        if (to != NULL) mixingToArray.add(to);
         TrackEntry* lastEntry = _mixingFrom != NULL ? _mixingFrom->setTimelineData(this, mixingToArray, propertyIDs) : this;
-        
-        if (to != NULL) {
-            mixingToArray.removeAt(mixingToArray.size() - 1);
-        }
+        if (to != NULL) mixingToArray.removeAt(mixingToArray.size() - 1);
         
         int mixingToLast = static_cast<int>(mixingToArray.size()) - 1;
         Vector<Timeline*>& timelines = _animation->_timelines;
         int timelinesCount = static_cast<int>(timelines.size());
         _timelineData.setSize(timelinesCount);
-        _timelineDipMix.clear();
         _timelineDipMix.setSize(timelinesCount);
         
         // outer:
-        for (int i = 0; i < timelinesCount; ++i) {
+        int i = 0;
+        continue_outer:
+        for (; i < timelinesCount; ++i) {
             int id = timelines[i]->getPropertyId();
             if (propertyIDs.contains(id)) {
                 _timelineData[i] = AnimationState::Subsequent;
-            }
-            else {
+            } else {
                 propertyIDs.add(id);
                 
                 if (to == NULL || !to->hasTimeline(id)) {
                     _timelineData[i] = AnimationState::First;
-                }
-                else {
+                } else {
                     for (int ii = mixingToLast; ii >= 0; --ii) {
                         TrackEntry* entry = mixingToArray[ii];
                         if (!entry->hasTimeline(id)) {
                             if (entry->_mixDuration > 0) {
                                 _timelineData[i] = AnimationState::DipMix;
                                 _timelineDipMix[i] = entry;
+                                i++;
                                 goto continue_outer; // continue outer;
                             }
                             break;
@@ -176,7 +170,6 @@ namespace Spine {
                     _timelineData[i] = AnimationState::Dip;
                 }
             }
-        continue_outer: {}
         }
         
         return lastEntry;
diff --git a/spine-cpp/spine-cpp/src/spine/Triangulator.cpp b/spine-cpp/spine-cpp/src/spine/Triangulator.cpp
index d5427db36..4b3ee9813 100644
--- a/spine-cpp/spine-cpp/src/spine/Triangulator.cpp
+++ b/spine-cpp/spine-cpp/src/spine/Triangulator.cpp
@@ -83,7 +83,7 @@ namespace Spine {
                     }
                     break;
                 }
-            break_outer:
+                break_outer:
                 
                 if (next == 0) {
                     do {