Merge branch 'master' into feature_top_right_layer_view

This commit is contained in:
ChrisTerBeke 2017-09-11 11:50:18 +02:00 committed by GitHub
commit 7efe3a3b9e
3 changed files with 12 additions and 12 deletions

View file

@ -334,8 +334,6 @@ class StartSliceJob(Job):
self._addRelations(changed_setting_keys, instance.definition.relations)
Job.yieldThread()
Logger.log("d", "changed_setting_keys=%s", changed_setting_keys)
# Ensure that the engine is aware what the build extruder is.
if stack.getProperty("machine_extruder_count", "value") > 1:
changed_setting_keys.add("extruder_nr")
@ -354,8 +352,6 @@ class StartSliceJob(Job):
setting.value = str(limited_stack.getProperty(key, "value")).encode("utf-8")
Logger.log("d", "key=%s value=%s", key, setting.value)
Job.yieldThread()
## Recursive function to put all settings that require each other for value changes in a list