summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaj Grönholm <kaj.gronholm@qt.io>2019-05-14 12:01:52 +0300
committerKaj Grönholm <kaj.gronholm@qt.io>2019-05-14 09:48:14 +0000
commit39a6846e93ad2c117be6c172e9d6f483357f2b42 (patch)
treee60816cfe2b55567856d63992c8a5e546c93a51c
parent3cad621f8b607eb915882caef5cbd439cfde26c5 (diff)
Ignore default materials in material file handling
Task-number: QT3DS-3351 Change-Id: I1b39bfdf777d11c45e212463d3dcc773aa4585da Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
index 65381efb..b821701d 100644
--- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
@@ -3717,9 +3717,13 @@ public:
auto parent = getOrCreateMaterialContainer();
TInstanceList children;
GetChildren(GetAssociatedSlide(parent), parent, children);
+ const QString defaultMaterialName
+ = getMaterialNameFromFilePath(m_Bridge.getDefaultMaterialName());
for (auto &instance : children) {
const auto name = GetName(instance).toQString();
+ if (name == defaultMaterialName)
+ continue;
const QString path = getFilePathFromMaterialName(name);
writeMaterialFile(getOrCreateMaterial(path), name, false, path);
}