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

This commit is contained in:
Jaime van Kessel 2016-07-04 17:11:50 +02:00
commit b3adf8a271
2 changed files with 9 additions and 1 deletions

View file

@ -371,7 +371,7 @@ Item
{
id: infillDensity
containerStackId: Cura.MachineManager.activeMachineId
containerStackId: Cura.MachineManager.activeStackId
key: "infill_sparse_density"
watchedProperties: [ "value" ]
storeIndex: 0
@ -406,6 +406,7 @@ Item
watchedProperties: [ "value" ]
storeIndex: 0
}
UM.SettingPropertyProvider
{
id: supportExtruderNr