summaryrefslogtreecommitdiffstats
path: root/src/runtime/Qt3DSActivationManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/runtime/Qt3DSActivationManager.cpp')
-rw-r--r--src/runtime/Qt3DSActivationManager.cpp7
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);