diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2018-12-04 15:58:57 +0200 |
|---|---|---|
| committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2018-12-04 15:28:31 +0000 |
| commit | 66506085b92b2c7a5947c35e7bb38a0fb222290c (patch) | |
| tree | f1be31d04526399fbb40940ba70a6af288e6aaf0 | |
| parent | 8151946fdb1d6b43b98622e26845b4d812afa544 (diff) | |
Fix crash when undoing material type changev2.2.0-beta3
Undoing a change from basic material to animatable material would crash
because property wouldn't actually exist anymore.
Task-number: QT3DS-2823
Change-Id: Iebb197ba2c26728d82af2c2c6a4458cb9baaaa87
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| -rw-r--r-- | src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp index 33ca1461..03d5c060 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp @@ -1203,6 +1203,9 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c return; propertySystem->GetInstancePropertyValue(instance, element->m_property, value); + if (value.getType() == qt3dsdm::DataModelDataType::None) + return; + const auto metaDataProvider = doc->GetStudioSystem()->GetActionMetaData(); const auto info = metaDataProvider->GetMetaDataPropertyInfo( metaDataProvider->GetMetaDataProperty(instance, element->m_property)); |