Merge branch '3.1'

This commit is contained in:
ChrisTerBeke 2017-11-27 17:17:02 +01:00
commit a072af5585
5 changed files with 141 additions and 100 deletions

View file

@ -337,7 +337,7 @@ Item
// machine gets changed.
var activeMachineId = Cura.MachineManager.activeMachineId;
if(!model.settable_per_extruder || machineExtruderCount.properties.value == 1)
if(!model.settable_per_extruder)
{
//Not settable per extruder or there only is global, so we must pick global.
return activeMachineId;