diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.cpp | 8 | ||||
| -rw-r--r-- | src/Authoring/Studio/Application/DataInputListDlg.cpp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.cpp b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.cpp index 90c376bb..3d9f1d5c 100644 --- a/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.cpp +++ b/src/Authoring/QT3DSIMP/Qt3DSImportLib/Qt3DSImportComposerTypes.cpp @@ -102,7 +102,9 @@ DataModelDataType::Value SImportControllableObject::GetPropertyDataType( ITERATE_COMPOSER_MATERIAL_PROPERTIES ITERATE_COMPOSER_NODE_PROPERTIES ITERATE_COMPOSER_LIGHT_PROPERTIES - return SImportAsset::GetPropertyDataType(inPropertyName); + // 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; } #undef HANDLE_COMPOSER_PROPERTY_NO_DEFAULT @@ -180,7 +182,9 @@ DataModelDataType::Value SImportControllableObject::GetPropertyDataType( ITERATE_COMPOSER_MATERIAL_PROPERTIES ITERATE_COMPOSER_NODE_PROPERTIES ITERATE_COMPOSER_LIGHT_PROPERTIES - return SImportAsset::GetPropertyDataType(inPropertyName); + // 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; } #undef HANDLE_COMPOSER_PROPERTY_NO_DEFAULT diff --git a/src/Authoring/Studio/Application/DataInputListDlg.cpp b/src/Authoring/Studio/Application/DataInputListDlg.cpp index a03e9dcd..9d5936f7 100644 --- a/src/Authoring/Studio/Application/DataInputListDlg.cpp +++ b/src/Authoring/Studio/Application/DataInputListDlg.cpp @@ -321,7 +321,7 @@ void CDataInputListDlg::updateInfo() = m_dataInputs[m_currentDataInputName]->externalPresBoundTypes.uniqueKeys(); for (auto &k : uniqueKeys) { m_infoContents->appendRow(QList<QStandardItem *>( - {new QStandardItem(QObject::tr("<subpresentation>")), + {new QStandardItem(QObject::tr("<another presentation>")), new QStandardItem(k), new QStandardItem()})); } } |