Revert "Ignore matdef changes triggered by the editor"

This reverts commit 2ba5f4d873a1fb04b891238f78868778fd4bc20f.
At least one place in the editor depends on reading the file again
after saving. Since there might be more, revert this for now.

Task-number: QT3DS-2822
Change-Id: I1737dd05de9a2402a6850b1eb5e1accd303316c2
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

3 files changed, 3 insertions, 25 deletions

diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
index 20cb4428..3171f50c 100644
--- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
@@ -171,7 +171,6 @@ class CDocEditor : public Q3DStudio::IInternalDocumentEditor
     Q3DStudio::Foundation::SStudioFoundation m_Foundation;
     TStreamFactoryPtr m_InputStreamFactory;
     std::unordered_map<long, QT3DSU32> m_GraphOrderMap;
-    bool m_ignoreNextMaterialDefChange = false;
 
 public:
     CDocEditor(CDoc &inDoc)
@@ -2038,11 +2037,8 @@ public:
                 fileInfo.dir().mkpath(QStringLiteral("."));
 
             QFile file(actualSourcePath);
-            if ((createNewFile && !file.exists()) || (!createNewFile && file.exists())) {
-                if (!createNewFile)
-                    m_ignoreNextMaterialDefChange = true;
+            if ((createNewFile && !file.exists()) || (!createNewFile && file.exists()))
                 saveMaterial(instance, file);
-            }
             return m_Doc.GetRelativePathToDoc(actualSourcePath);
         }
 
@@ -2116,16 +2112,6 @@ public:
             writeMaterialFile(material, false);
     }
 
-    bool isIgnoringNextMaterialDefChange() override
-    {
-        return m_ignoreNextMaterialDefChange;
-    }
-
-    void stopIgnoringNextMaterialDefChange() override
-    {
-        m_ignoreNextMaterialDefChange = false;
-    }
-
     void saveMaterial(Qt3DSDMInstanceHandle instance, QFile &file)
     {
         SValue value;
diff --git a/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h b/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h
index 4fb5d5e0..9319808f 100644
--- a/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h
+++ b/src/Authoring/Client/Code/Core/Doc/IDocumentEditor.h
@@ -181,9 +181,6 @@ public:
     virtual QString getMaterialDirectoryPath() const = 0;
     virtual QString getMaterialFilePath(const QString &materialName) const = 0;
 
-    virtual bool isIgnoringNextMaterialDefChange() = 0;
-    virtual void stopIgnoringNextMaterialDefChange() = 0;
-
     virtual void saveIfMaterial(Qt3DSDMInstanceHandle instance) = 0;
     virtual void writeMaterialFile(Qt3DSDMInstanceHandle instance, bool createNewFile) = 0;
     virtual Q3DStudio::CString writeMaterialFile(Qt3DSDMInstanceHandle instance,
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
index c593dea1..33ca1461 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp
@@ -511,19 +511,14 @@ void InspectorControlModel::setMaterials(std::vector<Q3DStudio::CFilePath> &mate
 
 void InspectorControlModel::setMatDatas(const std::vector<Q3DStudio::CFilePath> &matDatas)
 {
+    m_matDatas.clear();
+
     const auto doc = g_StudioApp.GetCore()->GetDoc();
     bool isDocModified = doc->IsModified();
     const auto sceneEditor = doc->getSceneEditor();
     if (!sceneEditor)
         return;
 
-    if (sceneEditor->isIgnoringNextMaterialDefChange()) {
-        sceneEditor->stopIgnoringNextMaterialDefChange();
-        return;
-    }
-
-    m_matDatas.clear();
-
     bool newMaterialSelected = false;
     for (const Q3DStudio::CFilePath &path : matDatas) {
         bool isNewFile = true;