Fix datainput controlled component activity changev2.5.0-rc3v2.5.0-rc2

Datainput control check needs to be done in the Update too.

Task-number: QT3DS-3988
Task-number: QT3DS-3989
Change-Id: Iab628ab5fcab57379c23ed8122d24d37f66b303b
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/runtime/Qt3DSActivationManager.cpp b/src/runtime/Qt3DSActivationManager.cpp
index 9b74ea5..cf14820 100644
--- a/src/runtime/Qt3DSActivationManager.cpp
+++ b/src/runtime/Qt3DSActivationManager.cpp
@@ -664,7 +664,12 @@ struct STimeContext
             parentActive = theParent->IsGlobalActive();
 
         bool wasActive = theContextNode.IsGlobalActive();
-        bool isActive = theContextNode.IsGlobalActive(parentActive);
+        bool isControlledByDi
+                = m_ControlledList.contains(theContextNode) && theContextNode.m_OnMaster;
+
+        // Override visibility for master slide elements that have datainput eyeball controller.
+        bool isActive = isControlledByDi ? theContextNode.IsControlledActive()
+                                         : theContextNode.IsGlobalActive(parentActive);
         bool activationChange = isActive != wasActive;
         inPerfTimer.Update("ActivationManager - Update Initial Vars",
                            qt3ds::foundation::Time::getCurrentCounterValue() - start);