From b6318addef176606a9387d6b198cee05a815082b Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Thu, 14 Mar 2024 11:59:48 +0200
Subject: [PATCH] QmlDesigner: Fix right click selection on 3D view

Right click on 3D view will now always clear selection if
there is no model under the cursor when click happens.

Fixes: QDS-12227
Change-Id: I922fc79472ced4a3aa5e518c03731edf240e1d43
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
---
 src/plugins/qmldesigner/components/edit3d/edit3dview.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
index e5ff133c69f..6073f565b61 100644
--- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
+++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
@@ -705,8 +705,13 @@ void Edit3DView::showContextMenu()
     if (m_nodeAtPosReqType == NodeAtPosReqType::ContextMenu)
         return;
 
-    if (m_contextMenuPendingNode.isValid() && !m_contextMenuPendingNode.isSelected())
-        setSelectedModelNode(m_contextMenuPendingNode);
+    if (m_contextMenuPendingNode.isValid()) {
+        if (!m_contextMenuPendingNode.isSelected())
+            setSelectedModelNode(m_contextMenuPendingNode);
+    } else {
+        clearSelectedModelNodes();
+    }
+
     m_edit3DWidget->showContextMenu(m_contextMenuPosMouse, m_contextMenuPendingNode, m_contextMenuPos3D);
     m_contextMenuPendingNode = {};
 }