diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-06-02 19:07:23 +0300 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-06-03 10:00:49 +0000 |
| commit | 8d11ec26566071a3118e222ab8d15641357d3f7d (patch) | |
| tree | 71f67098a407e7413fbba680bcdef9ada59e8f80 | |
| parent | 6a7f853ec940ed69358a3de58f6d1051d71db35f (diff) | |
QmlDesigner: Fix adding the first material to the material library
Fixed that material editor node was not being created when no materials
exist.
Fixes: QDS-7069
Change-Id: I358c497325e8865fc5f012531783dcbe46c32490
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp index 4a9487d9239..8476f0910a7 100644 --- a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp +++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp @@ -87,10 +87,6 @@ void MaterialEditorView::ensureMaterialLibraryNode() if (m_materialLibrary.isValid()) return; - const QList<ModelNode> materials = rootModelNode().subModelNodesOfType("QtQuick3D.Material"); - if (materials.isEmpty()) - return; - // create material library node TypeName nodeType = rootModelNode().isSubclassOf("QtQuick3D.Node") ? "QtQuick3D.Node" : "QtQuick.Item"; NodeMetaInfo metaInfo = model()->metaInfo(nodeType); @@ -99,6 +95,10 @@ void MaterialEditorView::ensureMaterialLibraryNode() m_materialLibrary.setIdWithoutRefactoring(Constants::MATERIAL_LIB_ID); rootModelNode().defaultNodeListProperty().reparentHere(m_materialLibrary); + const QList<ModelNode> materials = rootModelNode().subModelNodesOfType("QtQuick3D.Material"); + if (materials.isEmpty()) + return; + RewriterTransaction transaction = beginRewriterTransaction( "MaterialEditorView::ensureMaterialLibraryNode"); |