From a840c1be4a3d0d6478adb770014833c1f7486954 Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Mon, 23 Nov 2020 09:05:38 +0200 Subject: Fix crash when opening texture combobox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Custom materials still used TextureChooser for populating the combobox instead of ImageChooser. Task-number: QT3DS-4208 Change-Id: I696cc819df8f46ba40008f734bfcfd9990b2f551 Reviewed-by: Antti Määttä --- src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Authoring') diff --git a/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlView.qml b/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlView.qml index 5097fa85..d5570fc7 100644 --- a/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlView.qml +++ b/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlView.qml @@ -481,7 +481,7 @@ Rectangle { if (modelData.propertyType === AdditionalMetaDataType.Font) return fontDropDown; if (modelData.propertyType === AdditionalMetaDataType.Texture) - return textureChooser; + return imageChooser; if (modelData.propertyType === AdditionalMetaDataType.String) return editLine; if (modelData.propertyType === AdditionalMetaDataType.None) -- cgit v1.2.3