3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-27 21:01:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix merge conflicts from ui_rework_40

Browse source 
CURA-5943
This commit is contained in:
Lipu Fei 2018-11-29 15:27:06 +01:00
commit 6db52dde46
130 changed files with 2998 additions and 1740 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
View file

@ -21,7 +21,7 @@ Column
{
// FIXME For now the model should be removed and then created again, otherwise changes in the printer don't automatically update the UI
configurationList.model = []
if(outputDevice)
if (outputDevice)
{
configurationList.model = outputDevice.uniqueConfigurations
}