From b209badf6868e915a689cd6def63ad3b200eb537 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Thu, 22 Feb 2018 16:14:01 +0100 Subject: [PATCH] CURA-4606 CURA-5003 fix density and diameter in material manager --- resources/qml/Preferences/MaterialsPage.qml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml index de7b629f48..e4856a2d4b 100644 --- a/resources/qml/Preferences/MaterialsPage.qml +++ b/resources/qml/Preferences/MaterialsPage.qml @@ -388,18 +388,9 @@ Item materialProperties.description = currentItem.description ? currentItem.description : ""; materialProperties.adhesion_info = currentItem.adhesion_info ? currentItem.adhesion_info : ""; - if(currentItem.properties != undefined && currentItem.properties != null) - { - materialProperties.density = currentItem.density ? currentItem.density : 0.0; - materialProperties.diameter = currentItem.diameter ? currentItem.diameter : 0.0; - materialProperties.approximate_diameter = currentItem.approximate_diameter ? currentItem.approximate_diameter : "0"; - } - else - { - materialProperties.density = 0.0; - materialProperties.diameter = 0.0; - materialProperties.approximate_diameter = "0"; - } + materialProperties.density = currentItem.density ? currentItem.density : 0.0; + materialProperties.diameter = currentItem.diameter ? currentItem.diameter : 0.0; + materialProperties.approximate_diameter = currentItem.approximate_diameter ? currentItem.approximate_diameter : "0"; } Item