diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-05-08 14:38:00 +0300 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-05-08 11:58:37 +0000 |
| commit | f699744899fa6d149b21ab4412a2588854ae8dbc (patch) | |
| tree | 6710db314a6126ce4bc2bfee76f35021472322c6 /src/Runtime/Source/runtimerender | |
| parent | 4d81269affaa5369caa4aa0fda2b0523fa3f8ea8 (diff) | |
Add missing float4 types to Runtime data model datatypes
Task-number: QT3DS-3400
Change-Id: I17de1c3a1d6ba4a6877a9570ab9821523e345565
Reviewed-by: Jari Karppinen <jari.karppinen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/Source/runtimerender')
| -rw-r--r-- | src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp index 3fb7b53f..1037486b 100644 --- a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp +++ b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp @@ -222,11 +222,11 @@ struct SMetaPropertyParser : public IPropertyParser } Option<QT3DSVec2> ParseVec2(const char8_t *inName) override { - Option<qt3ds::QT3DSVec3> theProperty = + Option<qt3ds::QT3DSVec2> theProperty = m_MetaData.GetPropertyValueVector2(m_Type, Register(inName), m_ClassId); - if (theProperty.hasValue()) { - return QT3DSVec2(theProperty->x, theProperty->y); - } + if (theProperty.hasValue()) + return *theProperty; + return Empty(); } Option<QT3DSVec3> ParseVec3(const char8_t *inName) override |