From dda294f16e0a97ecf7d4708c0e414b62fba3b9fb Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Fri, 26 Jul 2024 11:45:31 +0300 Subject: [PATCH] QmlDesigner: Remove PrincipledMaterialEx from basic material types Change-Id: I290b1c3fb8ce12b6d0319d2ce2dee6cb71fd0a57 Reviewed-by: Mahmoud Badri --- .../materialeditor/materialeditorview.cpp | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp index c40d9f1b322..76d6bee2b02 100644 --- a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp +++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp @@ -58,11 +58,6 @@ 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) @@ -705,20 +700,12 @@ void MaterialEditorView::updatePossibleTypes() if (!m_qmlBackEnd) return; - static const QStringList basicTypes = []() { - QStringList types = { - "CustomMaterial", - "DefaultMaterial", - "PrincipledMaterial", - "PrincipledMaterialEx", - "SpecularGlossyMaterial", - }; - - if (!showPrincipledMaterialEx()) - types.removeOne("PrincipledMaterialEx"); - - return types; - }(); + static const QStringList basicTypes{ + "CustomMaterial", + "DefaultMaterial", + "PrincipledMaterial", + "SpecularGlossyMaterial", + }; const QString matType = m_selectedMaterial.simplifiedTypeName();