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

Materials are now also handled in conflict resolvement

Browse source 
CURA-1263
This commit is contained in:
Jaime van Kessel 2016-11-17 11:16:15 +01:00
parent 9539774c0b
commit 92a4fd7239
3 changed files with 62 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/3MFReader/WorkspaceDialog.qml
View file

@ -128,7 +128,7 @@ UM.Dialog
width: parent.width
height: visible ? 25 : 0
text: catalog.i18nc("@info:tooltip", "How should the conflict in the material(s) be resolved?")
visible: false //manager.materialConflict
visible: manager.materialConflict
Row
{
width: parent.width