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

remove crash mode in invokable methods

Browse source
This commit is contained in:
Andrew Meadows 2018-06-15 10:27:35 -07:00
parent 227bd1487e
commit 6331395a89
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/animation/src/AnimationCache.cpp
View file

@ -105,8 +105,10 @@ QStringList Animation::getJointNames() const {
return result; return result;
} }
QStringList names; QStringList names;
foreach (const FBXJoint& joint, _geometry->joints) { if (_geometry) {
names.append(joint.name); foreach (const FBXJoint& joint, _geometry->joints) {
names.append(joint.name);
}
} }
return names; return names;
} }
@ -114,11 +116,15 @@ QStringList Animation::getJointNames() const {
QVector<FBXAnimationFrame> Animation::getFrames() const { QVector<FBXAnimationFrame> Animation::getFrames() const {
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
QVector<FBXAnimationFrame> result; QVector<FBXAnimationFrame> result;
BLOCKING_INVOKE_METHOD(const_cast<Animation*>(this), "getFrames", BLOCKING_INVOKE_METHOD(const_cast<Animation*>(this), "getFrames",
Q_RETURN_ARG(QVector<FBXAnimationFrame>, result)); Q_RETURN_ARG(QVector<FBXAnimationFrame>, result));
return result; return result;
} }
return _geometry->animationFrames; if (_geometry) {
return _geometry->animationFrames;
} else {
return QVector<FBXAnimationFrame>();
}
} }
const QVector<FBXAnimationFrame>& Animation::getFramesReference() const { const QVector<FBXAnimationFrame>& Animation::getFramesReference() const {