aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2020-08-07 13:24:55 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2020-08-07 10:56:53 +0000
commit32f71ca8ffc317a0844fe910bfa32fa84737433f (patch)
tree525e5f606856a21a09fb8d4dfecb12f9e54e8713
parenta774890a10834a1d1aae5623316882f53d18aad0 (diff)
QmlDesigner: Fix group selection for 3D scenes that have Models as root
Change-Id: If6ec2bcb4a4627fcf658e23f6998115a68718ee8 Fixes: QDS-2467 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
-rw-r--r--share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml4
1 files changed, 3 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml
index 6eb68643ed..95245aae5e 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml
+++ b/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml
@@ -266,8 +266,10 @@ Item {
{
var theObject = object;
if (selectionMode === EditView3D.SelectionMode.Group) {
- while (theObject && theObject !== activeScene && theObject.parent !== activeScene)
+ while (theObject && theObject !== activeScene
+ && (activeScene instanceof Model || theObject.parent !== activeScene)) {
theObject = theObject.parent;
+ }
}
// Object selection logic:
// Regular click: Clear any multiselection, single-selects the clicked object