diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dactions.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dactions.cpp index 2cf6647aab2..d5c93ca4b97 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dactions.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dactions.cpp @@ -104,9 +104,8 @@ Edit3DCameraAction::Edit3DCameraAction(const QByteArray &menuId, bool Edit3DCameraAction::isEnabled(const SelectionContext &selectionContext) const { - return Utils::anyOf(selectionContext.selectedModelNodes(), [](const ModelNode &node) { - return node.isValid() && node.metaInfo().isQtQuick3DCamera(); - }); + return Utils::anyOf(selectionContext.selectedModelNodes(), + [](const ModelNode &node) { return node.metaInfo().isQtQuick3DCamera(); }); } } diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp index 3f7a0dca118..10c71c23ca6 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dcanvas.cpp @@ -152,7 +152,7 @@ void Edit3DCanvas::dragEnterEvent(QDragEnterEvent *e) // Allow drop when there is no valid active scene, as the drop goes under the root node of // the document in that case. - if (!node.isValid() || !ModelNode::isThisOrAncestorLocked(node)) { + if (!ModelNode::isThisOrAncestorLocked(node)) { QByteArray data = e->mimeData()->data(Constants::MIME_TYPE_ITEM_LIBRARY_INFO); if (!data.isEmpty()) { QDataStream stream(data); diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp index d95da6e8f25..b45847071bb 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp @@ -321,9 +321,8 @@ void Edit3DWidget::dropEvent(QDropEvent *dropEvent) QDataStream stream(data); qint32 internalId; stream >> internalId; - ModelNode matNode = m_view->modelNodeForInternalId(internalId); - if (matNode.isValid()) + if (ModelNode matNode = m_view->modelNodeForInternalId(internalId)) m_view->dropMaterial(matNode, dropEvent->position()); return; }