From ed2ed525b2958b8507071001c0c59efd4eb05c8f Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Wed, 9 Sep 2015 12:15:48 -0700 Subject: [PATCH] Tear down animGraph when turning off the avatar update thread. Otherwise, big time deltas accumulate. --- interface/src/Application.cpp | 1 + interface/src/avatar/MyAvatar.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index b8ddf1c4c2..eb4fbe9607 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2477,6 +2477,7 @@ void Application::init() { void Application::setAvatarUpdateThreading(bool isThreaded) { if (_avatarUpdate) { + getMyAvatar()->destroyAnimGraph(); _avatarUpdate->terminate(); } _avatarUpdate = new AvatarUpdate(); diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index cc26be9012..a3a7514778 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -152,6 +152,7 @@ public: bool getStandingHMDSensorMode() const { return _standingHMDSensorMode; } void doUpdateBillboard(); + void destroyAnimGraph(); public slots: void increaseSize(); @@ -291,7 +292,6 @@ private: void maybeUpdateBillboard(); void initHeadBones(); void initAnimGraph(); - void destroyAnimGraph(); void safelyLoadAnimations(); // Avatar Preferences