aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2022-09-30 14:10:26 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2022-09-30 11:15:00 +0000
commit5da5830fa7730f6b580e9b7abb5f113232edac50 (patch)
treee619bebb4f37fee1912c3f76b14bf7f25bb04821
parentd238c503992dd56f16c7820c362906a1460f91db (diff)
QmlDesigner: Fix dragging material from bundle to camera/light
Added check that target node is actually a model when applying material. Fixes: QDS-7843 Change-Id: I6e165280c8b79ebbf8316861fe0eb9b947eac3be Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
-rw-r--r--src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
index 90ef925ac4..c2120d9281 100644
--- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
+++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
@@ -202,7 +202,8 @@ void MaterialBrowserView::applyBundleMaterialToDropTarget(const ModelNode &bundl
newMatNode = bundleMat;
}
- if (m_bundleMaterialDropTarget.isValid()) {
+ if (m_bundleMaterialDropTarget.isValid()
+ && m_bundleMaterialDropTarget.isSubclassOf("QtQuick3D.Model")) {
QmlObjectNode qmlObjNode(m_bundleMaterialDropTarget);
if (m_bundleMaterialAddToSelected) {
// TODO: unify this logic as it exist elsewhere also