From 3e408a1a83451b4ae4e670708fa1a71f77c3109d Mon Sep 17 00:00:00 2001 From: Jere Tuliniemi Date: Tue, 17 Sep 2019 09:19:02 +0300 Subject: Add Vector4 to the data type drop down list Task-number: QT3DS-3947 Change-Id: I8b5555869ba472e6310b61b4c12331bda2c773d7 Reviewed-by: Miikka Heikkinen --- src/Authoring/Qt3DStudio/Application/DataInputSelectView.cpp | 3 +++ src/Authoring/Qt3DStudio/Palettes/Inspector/DataInputChooser.qml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Authoring/Qt3DStudio/Application/DataInputSelectView.cpp b/src/Authoring/Qt3DStudio/Application/DataInputSelectView.cpp index 472f0202..6fab215a 100644 --- a/src/Authoring/Qt3DStudio/Application/DataInputSelectView.cpp +++ b/src/Authoring/Qt3DStudio/Application/DataInputSelectView.cpp @@ -141,6 +141,9 @@ QString DataInputSelectView::getDiTypeStr(int type) case EDataType::DataTypeVector3: return tr("Vector3"); break; + case EDataType::DataTypeVector4: + return tr("Vector4"); + break; default: return {}; Q_ASSERT(false); diff --git a/src/Authoring/Qt3DStudio/Palettes/Inspector/DataInputChooser.qml b/src/Authoring/Qt3DStudio/Palettes/Inspector/DataInputChooser.qml index 3681a102..8b522e91 100644 --- a/src/Authoring/Qt3DStudio/Palettes/Inspector/DataInputChooser.qml +++ b/src/Authoring/Qt3DStudio/Palettes/Inspector/DataInputChooser.qml @@ -70,7 +70,7 @@ Rectangle { // index directly without going through string -> int table lookup model: [qsTr("[Compatible types]"), qsTr("[All types]"), qsTr("Boolean"), qsTr("Float"), qsTr("Ranged Number"), qsTr("String"), qsTr("Variant"), - qsTr("Vector2"), qsTr("Vector3")] + qsTr("Vector2"), qsTr("Vector3"), qsTr("Vector4")] onCurrentIndexChanged: _parentView.setTypeFilter(currentIndex - numOfFixedChoices); -- cgit v1.2.3