Merge remote-tracking branch 'refs/remotes/Ultimaker/master'

This commit is contained in:
Thomas Karl Pietrowski 2016-06-11 12:45:11 +02:00
commit 67a3ae36a5

View File

@ -61,7 +61,10 @@ class SettingOverrideDecorator(SceneNodeDecorator):
if self._extruder_stack: if self._extruder_stack:
extruder_stack = ContainerRegistry.getInstance().findContainerStacks(id = self._extruder_stack) extruder_stack = ContainerRegistry.getInstance().findContainerStacks(id = self._extruder_stack)
if extruder_stack: if extruder_stack:
self._stack.setNextStack(extruder_stack) old_extruder_stack_id = self._stack.getNextStack().getId()
self._stack.setNextStack(extruder_stack[0])
if self._stack.getNextStack().getId() != old_extruder_stack_id: #Only reslice if the extruder changed.
Application.getInstance().getBackend().forceSlice()
else: else:
UM.Logger.log("e", "Extruder stack %s below per-object settings does not exist.", self._extruder_stack) UM.Logger.log("e", "Extruder stack %s below per-object settings does not exist.", self._extruder_stack)
else: else: