From 3cf107f563a54ea29478acaba04d6609aa506193 Mon Sep 17 00:00:00 2001
From: Ali Kianian <ali.kianian@qt.io>
Date: Mon, 15 Jul 2024 16:29:15 +0300
Subject: [PATCH] QmlDesigner: Add PrincipledMaterialEx to QDS

Task-number: QDS-13226
Change-Id: I9313df343a92c5c2d55c4eba75e994b639fe7bb2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../materialeditor/materialeditorview.cpp     | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
index 0ac56d4740f..95caa90aa16 100644
--- a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
+++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
@@ -57,6 +57,11 @@ static bool containsTexture(const ModelNode &node)
     return false;
 };
 
+static bool showPrincipledMaterialEx()
+{
+    return Core::ICore::settings()->value("QML/Designer/ShowPrincipledMaterialEx", false).toBool();
+}
+
 MaterialEditorView::MaterialEditorView(ExternalDependenciesInterface &externalDependencies)
     : AbstractView{externalDependencies}
     , m_stackedWidget(new QStackedWidget)
@@ -719,12 +724,20 @@ void MaterialEditorView::updatePossibleTypes()
     if (!m_qmlBackEnd)
         return;
 
-    static const QStringList basicTypes {
-        "CustomMaterial",
-        "DefaultMaterial",
-        "PrincipledMaterial",
-        "SpecularGlossyMaterial"
-    };
+    static const QStringList basicTypes = []() {
+        QStringList types = {
+            "CustomMaterial",
+            "DefaultMaterial",
+            "PrincipledMaterial",
+            "PrincipledMaterialEx",
+            "SpecularGlossyMaterial",
+        };
+
+        if (!showPrincipledMaterialEx())
+            types.removeOne("PrincipledMaterialEx");
+
+        return types;
+    }();
 
     const QString matType = m_selectedMaterial.simplifiedTypeName();