summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@qt.io>2019-02-12 12:48:11 +0100
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2019-03-07 12:42:57 +0000
commitb1e215a2dfd9bb255126350e954b5fae666d4045 (patch)
tree7f8a84b709a66a2c2fcda20d7aaba3176c7b3bc2 /src
parenta6509c92d61da36819ee44775d291ad1563a53e3 (diff)
Fix data input for changing slides in nested components
Removed useless check that tested if the component was on the master or current slide, as that's not necessarily the case when you have nested components. Fixes: QT3DS-3033 Change-Id: I0af07a36ee7db62c355434ecdf8ee351a1fef505 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit bad87a705817355996c8265f5424beae39948e86) Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/runtime/q3dsscenemanager.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/runtime/q3dsscenemanager.cpp b/src/runtime/q3dsscenemanager.cpp
index 60cf6ec..b2fc907 100644
--- a/src/runtime/q3dsscenemanager.cpp
+++ b/src/runtime/q3dsscenemanager.cpp
@@ -9227,14 +9227,10 @@ void Q3DSSceneManager::changeSlideByName(Q3DSGraphObject *sceneOrComponent, cons
});
if (targetSlide) {
- if (component) {
- if (m_currentSlide->objects().contains(component) || m_masterSlide->objects().contains(component))
- setComponentCurrentSlide(targetSlide);
- else
- component->setCurrentSlide(targetSlide);
- } else {
+ if (component)
+ setComponentCurrentSlide(targetSlide);
+ else
setCurrentSlide(targetSlide);
- }
} else {
qWarning("changeSlideByName: Slide %s not found on %s", qPrintable(name), sceneOrComponent->id().constData());
}