QmlDesigner: Make PrincipledMaterial the default when adding material

PrincipledMaterial is created instead of DefaultMaterial whenever a
new material is created.

Fixes: QDS-9268
Change-Id: Iae97c5ac8c2be4a5ffdc26f9454344e1ae042290
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>

src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp

@@ -430,8 +430,9 @@ void MaterialEditorView::handleToolBarAction(int action)
             if (!matLib.isValid())
                 return;
 
-            NodeMetaInfo metaInfo = model()->metaInfo("QtQuick3D.DefaultMaterial");
+            NodeMetaInfo metaInfo = model()->qtQuick3DPrincipledMaterialMetaInfo();
-            ModelNode newMatNode = createModelNode("QtQuick3D.DefaultMaterial", metaInfo.majorVersion(),
+            ModelNode newMatNode = createModelNode("QtQuick3D.PrincipledMaterial",
+                                                   metaInfo.majorVersion(),
                                                    metaInfo.minorVersion());
             renameMaterial(newMatNode, "New Material");
             matLib.defaultNodeListProperty().reparentHere(newMatNode);

src/plugins/qmldesigner/designercore/include/model.h

@@ -91,6 +91,7 @@ public:
     NodeMetaInfo qtQuick3DMaterialMetaInfo() const;
     NodeMetaInfo qtQuick3DModelMetaInfo() const;
     NodeMetaInfo qtQuick3DNodeMetaInfo() const;
+    NodeMetaInfo qtQuick3DPrincipledMaterialMetaInfo() const;
     NodeMetaInfo qtQuick3DTextureMetaInfo() const;
     NodeMetaInfo qtQuickConnectionsMetaInfo() const;
     NodeMetaInfo qtQuickControlsTextAreaMetaInfo() const;

src/plugins/qmldesigner/designercore/model/abstractview.cpp

@@ -910,8 +910,9 @@ void AbstractView::assignMaterialTo3dModel(const ModelNode &modelNode, const Mod
 
         // if no valid material, create a new default material
         if (!newMaterialNode.isValid()) {
-            NodeMetaInfo metaInfo = model()->qtQuick3DDefaultMaterialMetaInfo();
+            NodeMetaInfo metaInfo = model()->qtQuick3DPrincipledMaterialMetaInfo();
-            newMaterialNode = createModelNode("QtQuick3D.DefaultMaterial", metaInfo.majorVersion(),
+            newMaterialNode = createModelNode("QtQuick3D.PrincipledMaterial",
+                                              metaInfo.majorVersion(),
                                               metaInfo.minorVersion());
             newMaterialNode.validId();
         }

src/plugins/qmldesigner/designercore/model/model.cpp

@@ -1959,6 +1959,16 @@ NodeMetaInfo Model::qtQuick3DDefaultMaterialMetaInfo() const
     }
 }
 
+NodeMetaInfo Model::qtQuick3DPrincipledMaterialMetaInfo() const
+{
+    if constexpr (useProjectStorage()) {
+        using namespace Storage::Info;
+        return createNodeMetaInfo<QtQuick3D, PrincipledMaterial>();
+    } else {
+        return metaInfo("QtQuick3D.PrincipledMaterial");
+    }
+}
+
 NodeMetaInfo Model::qtQuickTimelineTimelineMetaInfo() const
 {
     if constexpr (useProjectStorage()) {