1 files changed, 5 insertions, 5 deletions
diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.cpp b/src/Authoring/Client/Code/Core/Doc/Doc.cpp
index f321541d..a85cc2e2 100644
--- a/src/Authoring/Client/Code/Core/Doc/Doc.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/Doc.cpp
@@ -1269,15 +1269,15 @@ void CDoc::onPropertyChanged(qt3dsdm::Qt3DSDMInstanceHandle inInstance,
 {
     using namespace qt3dsdm;
     const auto bridge = m_StudioSystem->GetClientDataModelBridge();
+    bool isInsideMaterialContainer = bridge->isInsideMaterialContainer(inInstance);
     // Save the material definition upon undo and redo
-    if (m_Core->GetCmdStack()->isUndoingOrRedoing() &&
-            bridge->isInsideMaterialContainer(inInstance)) {
+    if (m_Core->GetCmdStack()->isUndoingOrRedoing() && isInsideMaterialContainer) {
         getSceneEditor()->saveIfMaterial(inInstance);
     }
 
     // If a material inside the material container is renamed, the file has to be renamed too
     // and the referenced materials that refer to that renamed material
-    if (inProperty == bridge->GetNameProperty() && bridge->isInsideMaterialContainer(inInstance)) {
+    if (inProperty == bridge->GetNameProperty() && isInsideMaterialContainer) {
         const auto sceneEditor = getSceneEditor();
         const QString dirPath = GetDocumentDirectory();
 
@@ -2900,9 +2900,9 @@ void CDoc::OnPresentationDeactivated()
  * @param outMats list of scene materials
  */
 void CDoc::getSceneMaterials(qt3dsdm::Qt3DSDMInstanceHandle inParent,
-                             QVector<qt3dsdm::Qt3DSDMInstanceHandle> &outMats) const
+                             QVector<qt3dsdm::Qt3DSDMInstanceHandle> &outMats)
 {
-    const CClientDataModelBridge *bridge = m_StudioSystem->GetClientDataModelBridge();
+    CClientDataModelBridge *bridge = m_StudioSystem->GetClientDataModelBridge();
     for (long i = 0, count = m_AssetGraph->GetChildCount(inParent); i < count; ++i) {
         qt3dsdm::Qt3DSDMInstanceHandle theChild(m_AssetGraph->GetChild(inParent, i));
         if (!bridge->isMaterialContainer(theChild) && !bridge->isInsideMaterialContainer(theChild)