diff options
| author | Määttä Antti <antti.maatta@qt.io> | 2017-11-14 13:00:42 +0200 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-11-14 12:25:54 +0000 |
| commit | 8be3eebadf0baa25d2d5d218a51227754e2b9fb8 (patch) | |
| tree | e400b323abbaf1fc789c0047bd4d821d8200f2a1 | |
| parent | d429e5ffad5dbe6cf4e2c4daa71ffc73533d8e4c (diff) | |
Fix hidden objects being visible on another slide
Hidden objects on one slide can appread visible on another, if they are
not used on that slide. This happens because the slide system invers the
active state at the end of the slide, which sets the hidden object as
visible. Since it is not used in the other slide, it won't be set
inactive.
Change the invert so that it only inverts the state if it was active.
Task-number: QT3DS-307
Change-Id: I159ef6d1a35a2de967da1432326deca0167174e7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/Runtime/Source/Runtime/Source/Qt3DSSlideSystem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSSlideSystem.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSSlideSystem.cpp index 9d0aac6f..a25d0d6a 100644 --- a/src/Runtime/Source/Runtime/Source/Qt3DSSlideSystem.cpp +++ b/src/Runtime/Source/Runtime/Source/Qt3DSSlideSystem.cpp @@ -393,7 +393,7 @@ struct SSlideSystem : public ISlideSystem } bool handleElementActive(SElement &inElement, bool inActive) { - if (m_InvertActive) + if (m_InvertActive && inElement.Flags().IsExplicitActive()) inActive = !inActive; inElement.Flags().SetExplicitActive(inActive); |