Merge pull request #14100 from danteruiz/soft-entities-updates

update soft entities and fix deadlock from qml.

John Conklin II committed 8 years ago

Commit afe6d972 parents 84178fa 613a6ab3 files · +49 −8Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 3 files). Show all

Unified · Split

         return -1;
     }
     int result;
-    BLOCKING_INVOKE_METHOD(_entityTree.get(), "getJointIndex",
+    _entityTree->withReadLock([&] {
-                              Q_RETURN_ARG(int, result), Q_ARG(QUuid, entityID), Q_ARG(QString, name));
+       result = _entityTree->getJointIndex(entityID, name);
+    });
     return result;
 }
         return QStringList();
     }
     QStringList result;
-    BLOCKING_INVOKE_METHOD(_entityTree.get(), "getJointNames",
+    _entityTree->withReadLock([&] {
-                              Q_RETURN_ARG(QStringList, result), Q_ARG(QUuid, entityID));
+        result = _entityTree->getJointNames(entityID);
+    });
     return result;
 }