From 608248bec825639d16d0c49029bfc14870d31a5e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Sat, 8 Oct 2016 17:14:24 +0200 Subject: [PATCH] Fix display of inherited materials Materials are sometimes inherited, such as for UM2E+. The activeQualityDefinitionId is the definition from which it should get its profiles, including material profiles. Likewise for activeQualityVariantId. Contributes to issue CURA-2576. --- resources/qml/Preferences/MaterialsPage.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml index b3aa3c96a0..8ba26b6ac3 100644 --- a/resources/qml/Preferences/MaterialsPage.qml +++ b/resources/qml/Preferences/MaterialsPage.qml @@ -1,5 +1,5 @@ // Copyright (c) 2016 Ultimaker B.V. -// Uranium is released under the terms of the AGPLv3 or higher. +// Cura is released under the terms of the AGPLv3 or higher. import QtQuick 2.1 import QtQuick.Controls 1.1 @@ -21,10 +21,10 @@ UM.ManagementPage var result = { "type": "material" } if(Cura.MachineManager.filterMaterialsByMachine) { - result.definition = Cura.MachineManager.activeDefinitionId + result.definition = Cura.MachineManager.activeQualityDefinitionId; if(Cura.MachineManager.hasVariants) { - result.variant = Cura.MachineManager.activeVariantId + result.variant = Cura.MachineManager.activeQualityVariantId; } } else