From 9884426ad83961a4c1eb89eeee610f6bb443e44b Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 26 Aug 2016 06:13:33 -0700 Subject: [PATCH] replace debugging aborts with asserts --- interface/src/avatar/MyAvatar.cpp | 2 +- libraries/controllers/src/controllers/UserInputMapper.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index a899406dc2..1d543b4ed5 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -534,7 +534,7 @@ void MyAvatar::updateFromHMDSensorMatrix(const glm::mat4& hmdSensorMatrix) { void MyAvatar::updateJointFromController(glm::mat4& previousSensorToWorldInverseMatrix, controller::Action poseKey, ThreadSafeValueCache& matrixCache) { - if (QThread::currentThread() != thread()) { abort(); } // XXX + assert(QThread::currentThread() == thread()); auto userInputMapper = DependencyManager::get(); controller::Pose controllerPose = userInputMapper->getPoseState(poseKey); Transform transform; diff --git a/libraries/controllers/src/controllers/UserInputMapper.cpp b/libraries/controllers/src/controllers/UserInputMapper.cpp index ec32e6b8c9..ff44d5d13d 100755 --- a/libraries/controllers/src/controllers/UserInputMapper.cpp +++ b/libraries/controllers/src/controllers/UserInputMapper.cpp @@ -335,7 +335,7 @@ QVector UserInputMapper::getActionNames() const { } Pose UserInputMapper::getPoseState(Action action) const { - if (QThread::currentThread() != thread()) { abort(); } // XXX + assert(QThread::currentThread() == thread()); return _poseStates[toInt(action)]; }