diff options
Diffstat (limited to 'src/plugins/qmldesigner/components/edit3d/edit3dview.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/components/edit3d/edit3dview.cpp | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index c8e1e222e5..87117f6318 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -112,7 +112,7 @@ void Edit3DView::updateActiveScene3D(const QVariantMap &sceneState) if (sceneState.contains(sceneKey)) { qint32 newActiveScene = sceneState[sceneKey].value<qint32>(); edit3DWidget()->canvas()->updateActiveScene(newActiveScene); - rootModelNode().setAuxiliaryData("3d-active-scene", newActiveScene); + rootModelNode().setAuxiliaryData("active3dScene", newActiveScene); } if (sceneState.contains(selectKey)) @@ -179,6 +179,17 @@ void Edit3DView::importsChanged(const QList<Import> &addedImports, checkImports(); } +void Edit3DView::customNotification(const AbstractView *view, const QString &identifier, + const QList<ModelNode> &nodeList, const QList<QVariant> &data) +{ + Q_UNUSED(view) + Q_UNUSED(nodeList) + Q_UNUSED(data) + + if (identifier == "asset_import_update") + resetPuppet(); +} + void Edit3DView::sendInputEvent(QInputEvent *e) const { if (nodeInstanceView()) @@ -257,7 +268,7 @@ void Edit3DView::createEdit3DActions() m_showGridAction = new Edit3DAction( QmlDesigner::Constants::EDIT3D_EDIT_SHOW_GRID, View3DActionCommand::ShowGrid, - QCoreApplication::translate("ShowGridAction", "Toggle grid visibility"), + QCoreApplication::translate("ShowGridAction", "Toggle Grid Visibility"), QKeySequence(Qt::Key_G), true, true, Icons::EDIT3D_GRID_OFF.icon(), Icons::EDIT3D_GRID_ON.icon()); @@ -301,14 +312,16 @@ QVector<Edit3DAction *> Edit3DView::rightActions() const void Edit3DView::addQuick3DImport() { - const QList<Import> imports = model()->possibleImports(); - for (const auto &import : imports) { - if (import.url() == "QtQuick3D") { - model()->changeImports({import}, {}); - - // Subcomponent manager update needed to make item library entries appear - QmlDesignerPlugin::instance()->currentDesignDocument()->updateSubcomponentManager(); - return; + if (model()) { + const QList<Import> imports = model()->possibleImports(); + for (const auto &import : imports) { + if (import.url() == "QtQuick3D") { + model()->changeImports({import}, {}); + + // Subcomponent manager update needed to make item library entries appear + QmlDesignerPlugin::instance()->currentDesignDocument()->updateSubcomponentManager(); + return; + } } } Core::AsynchronousMessageBox::warning(tr("Failed to Add Import"), |