Merge branch '4.0' of https://github.com/Ultimaker/Cura into 4.0

This commit is contained in:
Remco Burema 2018-12-20 09:54:21 +01:00
commit 481438d419
2 changed files with 8 additions and 3 deletions

View File

@ -229,6 +229,7 @@ class CuraEngineBackend(QObject, Backend):
if not self._build_plates_to_be_sliced:
self.processingProgress.emit(1.0)
Logger.log("w", "Slice unnecessary, nothing has changed that needs reslicing.")
self.setState(BackendState.Done)
return
if self._process_layers_job:

View File

@ -134,6 +134,9 @@ Column
onPreferenceChanged:
{
var autoSlice = UM.Preferences.getValue("general/auto_slice")
print(prepareButtons.autoSlice, autoSlice)
if(prepareButtons.autoSlice != autoSlice)
{
prepareButtons.autoSlice = autoSlice
if(autoSlice)
{
@ -141,6 +144,7 @@ Column
}
}
}
}
// Shortcut for "slice/stop"
Controls1.Action