Merge branch 'wip/animation' into dev

Conflicts:
	tests/manual/manual.pro

Change-Id: I524b37ea4ca0f82ee10438836ae9d40aad29576c

1 files changed, 7 insertions, 0 deletions

diff --git a/src/render/picking/objectpicker.cpp b/src/render/picking/objectpicker.cpp
index 6d84ec2a0..a90d8f537 100644
--- a/src/render/picking/objectpicker.cpp
+++ b/src/render/picking/objectpicker.cpp
@@ -44,6 +44,7 @@
 #include <Qt3DRender/private/qobjectpicker_p.h>
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
+#include <Qt3DCore/private/qpropertyupdatedchangebase_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -141,6 +142,7 @@ void ObjectPicker::onClicked(QPickEventPtr event)
     e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
     e->setPropertyName("clicked");
     e->setValue(QVariant::fromValue(event));
+    Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(e.data())->m_isFinal = true;
     notifyObservers(e);
 }
 
@@ -150,6 +152,7 @@ void ObjectPicker::onMoved(QPickEventPtr event)
     e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
     e->setPropertyName("moved");
     e->setValue(QVariant::fromValue(event));
+    Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(e.data())->m_isFinal = true;
     notifyObservers(e);
 }
 
@@ -160,6 +163,7 @@ void ObjectPicker::onPressed(QPickEventPtr event)
     e->setPropertyName("pressed");
     e->setValue(QVariant::fromValue(event));
     m_isPressed = true;
+    Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(e.data())->m_isFinal = true;
     notifyObservers(e);
 }
 
@@ -170,6 +174,7 @@ void ObjectPicker::onReleased(QPickEventPtr event)
     e->setPropertyName("released");
     e->setValue(QVariant::fromValue(event));
     m_isPressed = false;
+    Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(e.data())->m_isFinal = true;
     notifyObservers(e);
 }
 
@@ -178,6 +183,7 @@ void ObjectPicker::onEntered()
     auto e = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
     e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
     e->setPropertyName("entered");
+    Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(e.data())->m_isFinal = true;
     notifyObservers(e);
 }
 
@@ -186,6 +192,7 @@ void ObjectPicker::onExited()
     auto e = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
     e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
     e->setPropertyName("exited");
+    Qt3DCore::QPropertyUpdatedChangeBasePrivate::get(e.data())->m_isFinal = true;
     notifyObservers(e);
 }