From 58c0ba0f94df44c4ef24af864cb63d163fedfa1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kaj=20Gr=C3=B6nholm?= Date: Mon, 5 Oct 2020 11:25:52 +0300 Subject: Revert "Fix slide activity changes" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5f8471a92868a06298ef0e0f1047d20491ac7f46 as it causes issues with existing projects. Change-Id: I903b104c325323d1b6fb53c1313921ee593c156b Reviewed-by: Antti Määttä Reviewed-by: Tomi Korpipää --- src/runtime/Qt3DSSlideSystem.cpp | 5 ----- 1 file changed, 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, -- cgit v1.2.3