diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-09-21 10:59:59 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-09-21 11:16:29 +0200 |
| commit | 3011548066174e964dad6617e37792679941a2d6 (patch) | |
| tree | d9edc436c9d4b4b39bacc50ded2f9c23b9a874b0 /src/plugins/qmldesigner/components/edit3d/edit3dview.cpp | |
| parent | d696f3380cb7191b2b6239894b9c6c4b4a0fc043 (diff) | |
| parent | 5ebb467cc622a9dc91ff4ec0f02de257f19d69a0 (diff) | |
| download | qt-creator-3011548066174e964dad6617e37792679941a2d6.tar.gz | |
Merge remote-tracking branch 'origin/8.0'
Conflicts:
src/libs/utils/deviceshell.cpp
src/plugins/clangcodemodel/clangdclient.cpp
src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
src/plugins/remotelinux/linuxdevice.cpp
Change-Id: Idc2edf428c98e9cbc891f1833b271ce2def9a835
Diffstat (limited to 'src/plugins/qmldesigner/components/edit3d/edit3dview.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/components/edit3d/edit3dview.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index f0789bd6d9..d9a0ad2824 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -1,15 +1,16 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "edit3dview.h" +#include "backgroundcolorselection.h" #include "edit3dactions.h" #include "edit3dcanvas.h" -#include "edit3dview.h" -#include "edit3dwidget.h" #include "edit3dviewconfig.h" -#include "backgroundcolorselection.h" +#include "edit3dwidget.h" #include "metainfo.h" -#include "seekerslider.h" #include "nodehints.h" +#include "seekerslider.h" +#include "view3dactioncommand.h" #include <auxiliarydataproperties.h> #include <coreplugin/icore.h> @@ -287,6 +288,8 @@ void Edit3DView::nodeAtPosReady(const ModelNode &modelNode, const QVector3D &pos assignMaterialTo3dModel(modelNode, m_droppedMaterial); }); } + } else if (m_nodeAtPosReqType == NodeAtPosReqType::BundleMaterialDrop) { + emitCustomNotification("drop_bundle_material", {modelNode}); // To MaterialBrowserView } m_nodeAtPosReqType = NodeAtPosReqType::None; } @@ -837,4 +840,11 @@ void Edit3DView::dropMaterial(const ModelNode &matNode, const QPointF &pos) emitView3DAction(View3DActionType::GetNodeAtPos, pos); } +void Edit3DView::dropBundleMaterial(const QPointF &pos) +{ + m_nodeAtPosReqType = NodeAtPosReqType::BundleMaterialDrop; + QmlDesignerPlugin::instance()->viewManager().nodeInstanceView()->view3DAction( + View3DActionType::GetNodeAtPos, pos); +} + } // namespace QmlDesigner |