Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2016-06-06 10:19:14 +02:00
commit ffd309f816
10 changed files with 54 additions and 41 deletions

View file

@ -49,7 +49,7 @@ ScrollView
//Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989
//In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes,
//causing nasty issues when selecting different options. So disable asynchronous loading of enum type completely.
asynchronous: model.type != "enum"
asynchronous: model.type != "enum" && model.type != "extruder"
active: model.type != undefined
source: