diff options
Diffstat (limited to 'src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp')
-rw-r--r-- | src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp index 33ca1461..c593dea1 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp @@ -511,14 +511,19 @@ 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; |