summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaj Grönholm <kaj.gronholm@qt.io>2020-10-05 11:25:52 +0300
committerKaj Grönholm <kaj.gronholm@qt.io>2020-10-05 12:11:04 +0300
commit58c0ba0f94df44c4ef24af864cb63d163fedfa1c (patch)
tree944e791d5a13fb605ac265f424ddf04c96602294
parent5f8471a92868a06298ef0e0f1047d20491ac7f46 (diff)
Revert "Fix slide activity changes"
This reverts commit 5f8471a92868a06298ef0e0f1047d20491ac7f46 as it causes issues with existing projects. Change-Id: I903b104c325323d1b6fb53c1313921ee593c156b Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--src/runtime/Qt3DSSlideSystem.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/runtime/Qt3DSSlideSystem.cpp b/src/runtime/Qt3DSSlideSystem.cpp
index 4cdce28..4eaa698 100644
--- a/src/runtime/Qt3DSSlideSystem.cpp
+++ b/src/runtime/Qt3DSSlideSystem.cpp
@@ -457,11 +457,6 @@ struct SSlideSystem : public ISlideSystem
if (!theElem) {
QT3DS_ASSERT(false);
} else {
- // If slide element doesn't contain any attributes, don't continue
- // even to activity change.
- if (theElement->m_AttributeCount == 0)
- continue;
-
if (inOp.handleElementActive(*theElem, theElement->m_Active)) {
for (TSlideAttributeNodeList::const_iterator
iter = TSlideAttributeNodeList::begin(theElement->m_AttributeNodes,