Show ref material parent in the inspector

- When setting a ref material, show the parent of the referenced
material between brackets in the combobox.
- Fix ref material popup not closing when selecting an item.

Task-number: QT3DS-2312
Change-Id: I206fae2de1b5a37bf3b15a6f43ce137aeb279d13
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
index b28af190..7e93f2d9 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
@@ -251,10 +251,8 @@ QString InspectorControlView::titleText() const
 
 bool InspectorControlView::isRefMaterial(int instance) const
 {
-    CDoc *doc = g_StudioApp.GetCore()->GetDoc();
-
-    return doc->GetStudioSystem()->GetClientDataModelBridge()->GetObjectType(instance)
-           == OBJTYPE_REFERENCEDMATERIAL;
+    auto bridge = g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()->GetClientDataModelBridge();
+    return bridge->IsReferencedMaterialInstance(instance);
 }
 
 bool InspectorControlView::canLinkProperty(int instance, int handle) const
@@ -589,6 +587,7 @@ QObject *InspectorControlView::showMaterialReference(int handle, int instance, c
             Q3DStudio::SCOPED_DOCUMENT_EDITOR(*doc, QObject::tr("Set Property"))
                     ->SetInstancePropertyValue(instance, handle, objRef);
         }
+       m_matRefListWidget->hide();
     });
 
     return m_matRefListWidget;