From bc5dad22ec2ef43f1632e71ed22957c6a3a09144 Mon Sep 17 00:00:00 2001
From: Matthias Puchner <github@mpuchner.de>
Date: Thu, 2 Dec 2021 08:16:17 +0100
Subject: [PATCH] simplify material copying
---
GUI/Model/Job/JobModelFunctions.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/GUI/Model/Job/JobModelFunctions.cpp b/GUI/Model/Job/JobModelFunctions.cpp
index 2151c4d6123..b57df4b4f5b 100644
--- a/GUI/Model/Job/JobModelFunctions.cpp
+++ b/GUI/Model/Job/JobModelFunctions.cpp
@@ -131,11 +131,8 @@ void GUI::Model::JobFunctions::setupJobItemSampleData(JobItem* jobItem,
// copy used materials into material container
for (auto* itemWithMaterial : sampleItem->itemsWithMaterial()) {
auto* material = itemWithMaterial->materialItem();
- if (!jobItem->materialItems().findMaterialItem(material->identifier())) {
- auto* materialCopy = jobItem->materialItems().insertCopy(*material);
- materialCopy->setIdentifier(material->identifier()); // insertCopy() doesn't do this
- materialCopy->setMaterialName(material->materialName()); // insertCopy() doesn't do this
- }
+ if (!jobItem->materialItems().findMaterialItem(material->identifier()))
+ jobItem->materialItems().addMaterial(new MaterialItem(*material));
}
}
--
GitLab