feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix dragging material from bundle to camera/light

Browse Source 
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>
This commit is contained in:
Miikka Heikkinen
2022-09-30 14:10:26 +03:00
parent d238c50399
commit 5da5830fa7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
View File

@@ -202,7 +202,8 @@ void MaterialBrowserView::applyBundleMaterialToDropTarget(const ModelNode &bundl
newMatNode = bundleMat; newMatNode = bundleMat;
} }
if (m_bundleMaterialDropTarget.isValid()) { if (m_bundleMaterialDropTarget.isValid()
&& m_bundleMaterialDropTarget.isSubclassOf("QtQuick3D.Model")) {
QmlObjectNode qmlObjNode(m_bundleMaterialDropTarget); QmlObjectNode qmlObjNode(m_bundleMaterialDropTarget);
if (m_bundleMaterialAddToSelected) { if (m_bundleMaterialAddToSelected) {
// TODO: unify this logic as it exist elsewhere also // TODO: unify this logic as it exist elsewhere also