Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

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);
     }