Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 09:17:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

call into correct thread to getJointNames on entity

Browse source
This commit is contained in:
Seth Alves 2016-01-19 15:16:58 -08:00
parent f265656e74
commit a515d6debe
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -774,6 +774,11 @@ int RenderableModelEntityItem::getJointIndex(const QString& name) const {
QStringList RenderableModelEntityItem::getJointNames() const { QStringList RenderableModelEntityItem::getJointNames() const {
QStringList result; 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()) { if (_model && _model->isActive()) {
RigPointer rig = _model->getRig(); RigPointer rig = _model->getRig();
int jointCount = rig->getJointStateCount(); int jointCount = rig->getJointStateCount();