Skip to content
Snippets Groups Projects
Commit 010c6eac authored by Matthias Puchner's avatar Matthias Puchner
Browse files

rectify material access for job items

parent 003cfad3
No related branches found
No related tags found
1 merge request!275rectify material access for job items
Pipeline #43682 passed
......@@ -13,6 +13,9 @@
// ************************************************************************************************
#include "GUI/Models/ItemWithMaterial.h"
#include "GUI/Models/JobItem.h"
#include "GUI/Models/JobModelFunctions.h"
#include "GUI/Models/MaterialItemContainer.h"
#include "GUI/Models/MaterialItemUtils.h"
#include "GUI/Views/PropertyEditor/CustomEditors.h"
......@@ -40,11 +43,21 @@ void ItemWithMaterial::setMaterialUndefined()
QColor ItemWithMaterial::materialColor() const
{
const auto parentJob = GUI::Model::JobFunctions::findJobItem(this);
if (parentJob)
return parentJob->materialContainerItem()->findMaterialById(materialIdentifier())->color();
return GUI::Model::MaterialItemUtils::findMaterial(materialIdentifier())->color();
}
QString ItemWithMaterial::materialName() const
{
const auto parentJob = GUI::Model::JobFunctions::findJobItem(this);
if (parentJob)
return parentJob->materialContainerItem()
->findMaterialById(materialIdentifier())
->itemName();
return GUI::Model::MaterialItemUtils::findMaterial(materialIdentifier())->itemName();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment