From a515d6debe563e5d08342fd272776eace79c6431 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 19 Jan 2016 15:16:58 -0800
Subject: [PATCH] call into correct thread to getJointNames on entity

---
 .../entities-renderer/src/RenderableModelEntityItem.cpp      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 72dc79b882..0d99376a7b 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -774,6 +774,11 @@ int RenderableModelEntityItem::getJointIndex(const QString& name) const {
 
 QStringList RenderableModelEntityItem::getJointNames() const {
     QStringList result;
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(const_cast<RenderableModelEntityItem*>(this), "getJointNames", Qt::BlockingQueuedConnection,
+                                  Q_RETURN_ARG(QStringList, result));
+        return result;
+    }
     if (_model && _model->isActive()) {
         RigPointer rig = _model->getRig();
         int jointCount = rig->getJointStateCount();