forked from qt-creator/qt-creator
QmlDesigner: Remove PrincipledMaterialEx from basic material types
Change-Id: I290b1c3fb8ce12b6d0319d2ce2dee6cb71fd0a57 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
@@ -58,11 +58,6 @@ static bool containsTexture(const ModelNode &node)
|
|||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
static bool showPrincipledMaterialEx()
|
|
||||||
{
|
|
||||||
return Core::ICore::settings()->value("QML/Designer/ShowPrincipledMaterialEx", false).toBool();
|
|
||||||
}
|
|
||||||
|
|
||||||
MaterialEditorView::MaterialEditorView(ExternalDependenciesInterface &externalDependencies)
|
MaterialEditorView::MaterialEditorView(ExternalDependenciesInterface &externalDependencies)
|
||||||
: AbstractView{externalDependencies}
|
: AbstractView{externalDependencies}
|
||||||
, m_stackedWidget(new QStackedWidget)
|
, m_stackedWidget(new QStackedWidget)
|
||||||
@@ -705,21 +700,13 @@ void MaterialEditorView::updatePossibleTypes()
|
|||||||
if (!m_qmlBackEnd)
|
if (!m_qmlBackEnd)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
static const QStringList basicTypes = []() {
|
static const QStringList basicTypes{
|
||||||
QStringList types = {
|
|
||||||
"CustomMaterial",
|
"CustomMaterial",
|
||||||
"DefaultMaterial",
|
"DefaultMaterial",
|
||||||
"PrincipledMaterial",
|
"PrincipledMaterial",
|
||||||
"PrincipledMaterialEx",
|
|
||||||
"SpecularGlossyMaterial",
|
"SpecularGlossyMaterial",
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!showPrincipledMaterialEx())
|
|
||||||
types.removeOne("PrincipledMaterialEx");
|
|
||||||
|
|
||||||
return types;
|
|
||||||
}();
|
|
||||||
|
|
||||||
const QString matType = m_selectedMaterial.simplifiedTypeName();
|
const QString matType = m_selectedMaterial.simplifiedTypeName();
|
||||||
|
|
||||||
if (basicTypes.contains(matType)) {
|
if (basicTypes.contains(matType)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user