From 43b995f42467f4ccb1827aecab603ba2ff018841 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 17 Jun 2019 12:44:35 +0300 Subject: Fix isMaterialContainer check when there is no material container MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Mahmoud Badri Reviewed-by: Janne Kangas Reviewed-by: Antti Määttä --- .../Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3