diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/logic/executor.cpp | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/logic/executor.cpp')
-rw-r--r-- | src/logic/executor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/logic/executor.cpp b/src/logic/executor.cpp index 74267379e..6134e801e 100644 --- a/src/logic/executor.cpp +++ b/src/logic/executor.cpp @@ -38,11 +38,13 @@ ****************************************************************************/ #include "executor_p.h" + #include <Qt3DLogic/qframeaction.h> #include <Qt3DCore/qnode.h> -#include <Qt3DCore/private/qscene_p.h> #include <QtCore/qsemaphore.h> +#include <Qt3DCore/private/qscene_p.h> + QT_BEGIN_NAMESPACE using namespace Qt3DCore; @@ -94,7 +96,7 @@ void Executor::processLogicFrameUpdates(float dt) const QVector<QNode *> nodes = m_scene->lookupNodes(m_nodeIds); for (QNode *node : nodes) { QFrameAction *frameAction = qobject_cast<QFrameAction *>(node); - if (frameAction) + if (frameAction && frameAction->isEnabled()) frameAction->onTriggered(dt); } |