From 28b6c30bd8ffdb1bbdb61fe2369f39464e958eaa Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 4 Jan 2023 16:50:16 +0100 Subject: [PATCH] QmlDesigner: Fix lingering merge conflict Materials are applied to Quick3DModel not QtQuick3DParticles3DModel (Which does not exist). Change-Id: I350d9864c7eb3a7b6879e8d58646c7c2c7b8e0d2 Reviewed-by: Miikka Heikkinen --- .../components/navigator/choosefrompropertylistdialog.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp b/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp index fd286d74808..dc3bf99ba6d 100644 --- a/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp +++ b/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp @@ -90,11 +90,11 @@ ChooseFromPropertyListFilter::ChooseFromPropertyListFilter(const NodeMetaInfo &i || parentInfo.isQtQuick3DParticles3DAttractor3D()) propertyList.append("shape"); } else if (insertInfo.isQtQuick3DMaterial()) { - if (parentInfo.isQtQuick3DParticles3DModel()) + if (parentInfo.isQtQuick3DModel()) + propertyList.append("materials"); + } else if (insertInfo.typeName().startsWith("ComponentBundles.MaterialBundle")) { + if (parentInfo.isQtQuick3DModel()) propertyList.append("materials"); -// TODO merge conflict between Change-Id: If3c58f82797beabe76baf99ea2dddc59032729df and Change-Id: Iff2dea66e253b412105427134bd49cb16ed76193 -// } else if (insertInfo.typeName().startsWith("ComponentBundles.MaterialBundle")) { -// if (parentInfo.isSubclassOf("QtQuick3D.Model")) } else if (insertInfo.isEffectMaker()) { if (parentInfo.isQtQuickItem()) propertyList.append("effect");