3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '4.11'

Browse source
This commit is contained in:
Ghostkeeper 2021-08-17 13:35:00 +02:00
commit 901b05d1a6
No known key found for this signature in database
GPG key ID: 68F39EA88EEED5FF
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/Preferences/Materials/MaterialsView.qml
View file

@ -39,14 +39,14 @@ TabView
} }
if (!base.containerId || !base.editingEnabled || !base.currentMaterialNode) if (!base.containerId || !base.editingEnabled || !base.currentMaterialNode)
{ {
return "" return "";
} }
var linkedMaterials = Cura.ContainerManager.getLinkedMaterials(base.currentMaterialNode, true); var linkedMaterials = Cura.ContainerManager.getLinkedMaterials(base.currentMaterialNode, true);
if (linkedMaterials.length == 0) if (linkedMaterials.length == 0)
{ {
return "" return "";
} }
return linkedMaterials; return linkedMaterials.join(", ");
} }
function getApproximateDiameter(diameter) function getApproximateDiameter(diameter)