From acbeb326a70fbf4cae30790bcd256656f135dc0c Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Tue, 27 Aug 2019 10:57:22 -0700
Subject: [PATCH] Set activation when switching random states

---
 libraries/animation/src/AnimContext.h        | 2 --
 libraries/animation/src/AnimRandomSwitch.cpp | 8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libraries/animation/src/AnimContext.h b/libraries/animation/src/AnimContext.h
index 5f353fcae4..9ad37b513e 100644
--- a/libraries/animation/src/AnimContext.h
+++ b/libraries/animation/src/AnimContext.h
@@ -45,7 +45,6 @@ public:
     bool getEnableDebugDrawIKChains() const { return _enableDebugDrawIKChains; }
     const glm::mat4& getGeometryToRigMatrix() const { return _geometryToRigMatrix; }
     const glm::mat4& getRigToWorldMatrix() const { return _rigToWorldMatrix; }
-    int getEvaluationCount() const { return _evaluationCount; }
 
     float getDebugAlpha(const QString& key) const {
         auto it = _debugAlphaMap.find(key);
@@ -87,7 +86,6 @@ protected:
     bool _enableDebugDrawIKChains { false };
     glm::mat4 _geometryToRigMatrix;
     glm::mat4 _rigToWorldMatrix;
-    int _evaluationCount{ 0 };
 
     // used for debugging internal state of animation system.
     mutable DebugAlphaMap _debugAlphaMap;
diff --git a/libraries/animation/src/AnimRandomSwitch.cpp b/libraries/animation/src/AnimRandomSwitch.cpp
index 3fbd57dde4..4f137f7be4 100644
--- a/libraries/animation/src/AnimRandomSwitch.cpp
+++ b/libraries/animation/src/AnimRandomSwitch.cpp
@@ -168,8 +168,16 @@ void AnimRandomSwitch::addState(RandomSwitchState::Pointer randomState) {
 }
 
 void AnimRandomSwitch::switchRandomState(const AnimVariantMap& animVars, const AnimContext& context, RandomSwitchState::Pointer desiredState, bool shouldInterp) {
+
+    auto prevStateNode = _children[_currentState->getChildIndex()];
     auto nextStateNode = _children[desiredState->getChildIndex()];
+
+    // activate/deactivate states
+    prevStateNode->setActive(false);
+    nextStateNode->setActive(true);
+
     _lastPlayedState = nextStateNode->getID();
+
     if (shouldInterp) {
 
         bool interpActive = _duringInterp;