diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-06-17 12:44:35 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-06-17 12:50:45 +0300 |
| commit | 43b995f42467f4ccb1827aecab603ba2ff018841 (patch) | |
| tree | a9b2eec30b42a7f03fb7ea524b3751340012703b | |
| parent | 7260150d6ad25219acae75e631ab4000ce85a481 (diff) | |
Fix isMaterialContainer check when there is no material container
Checking if invalid instance is equal to material container returned
true when material container didn't exist in the presentation.
While technically correct, it is not what is expected by users of
isMaterialContainer.
Task-number: QT3DS-3668
Change-Id: I6bf73fd9aa39adfe25f4a89719c6ae31fe34119f
Reviewed-by: Jari Karppinen <jari.karppinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| -rw-r--r-- | src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp index 7d1b11a5..f6beca04 100644 --- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp +++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp @@ -1173,7 +1173,7 @@ Qt3DSDMInstanceHandle CClientDataModelBridge::getMaterialReference(Qt3DSDMInstan bool CClientDataModelBridge::isMaterialContainer(Qt3DSDMInstanceHandle instance) const { - return instance == getMaterialContainer(); + return instance.Valid() && instance == getMaterialContainer(); } bool CClientDataModelBridge::isInsideMaterialContainer(Qt3DSDMInstanceHandle instance) const |