Merge branch 'master' into refactoring_machine_manager

This commit is contained in:
Jack Ha 2018-02-27 10:24:56 +01:00
commit 22cf5abec2
18 changed files with 419 additions and 201 deletions

View file

@ -136,6 +136,11 @@ class StartSliceJob(Job):
self.setResult(StartJobResult.MaterialIncompatible)
return
# Validate settings per selectable model
if Application.getInstance().getObjectsModel().stacksHaveErrors():
self.setResult(StartJobResult.ObjectSettingError)
return
# Don't slice if there is a per object setting with an error value.
for node in DepthFirstIterator(self._scene.getRoot()):
if node.isSelectable():