summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2019-06-24 14:24:33 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2019-06-24 14:24:33 +0300
commit825c535318d96e59c2f6218fb8b041d47318386c (patch)
tree6503c934e725beb4db5e4ff05214dd8f5bf6f4c4
parent0998331303ddb079868e4c347f9b22fc9af9262d (diff)
Fix invalid datainput type mismatch warnings for camera properties
Task-number: QT3DS-3694 Change-Id: Ie342da943d71f1c37eda48295689866eb3305d35 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
-rw-r--r--src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.cpp
index d1d692fb..b5dab1c1 100644
--- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.cpp
+++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.cpp
@@ -114,6 +114,7 @@ DataModelDataType::Value SImportControllableObject::GetPropertyDataType(
ITERATE_COMPOSER_MATERIAL_PROPERTIES
ITERATE_COMPOSER_NODE_PROPERTIES
ITERATE_COMPOSER_LIGHT_PROPERTIES
+ ITERATE_COMPOSER_CAMERA_PROPERTIES
// Cannot fall back to SImportAsset as we might receive custom material
// properties which are not known to property system and cause assert.
return DataModelDataType::None;