summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJere Tuliniemi <jere.tuliniemi@qt.io>2019-09-17 09:19:02 +0300
committerJere Tuliniemi <jere.tuliniemi@qt.io>2019-09-18 13:13:30 +0300
commit3e408a1a83451b4ae4e670708fa1a71f77c3109d (patch)
treeb3c16cd685ac27cee67a442cce7b4cf530454842
parent0d60954c66b58c6762b03eadcd1bd00e040d2f80 (diff)
Add Vector4 to the data type drop down list
Task-number: QT3DS-3947 Change-Id: I8b5555869ba472e6310b61b4c12331bda2c773d7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/Authoring/Qt3DStudio/Application/DataInputSelectView.cpp3
-rw-r--r--src/Authoring/Qt3DStudio/Palettes/Inspector/DataInputChooser.qml2
2 files changed, 4 insertions, 1 deletions
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);