GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 05:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ChrisTerBeke 2017-09-11 11:36:04 +02:00
commit 9623ed75ac
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/BuildVolume.py
View File

@ -96,7 +96,7 @@ class BuildVolume(SceneNode):
self._scene_change_timer.timeout.connect(self._onSceneChangeTimerFinished) self._scene_change_timer.timeout.connect(self._onSceneChangeTimerFinished)
self._setting_change_timer = QTimer() self._setting_change_timer = QTimer()
self._setting_change_timer.setInterval(100) self._setting_change_timer.setInterval(150)
self._setting_change_timer.setSingleShot(True) self._setting_change_timer.setSingleShot(True)
self._setting_change_timer.timeout.connect(self._onSettingChangeTimerFinished) self._setting_change_timer.timeout.connect(self._onSettingChangeTimerFinished)

2
plugins/CuraEngineBackend/StartSliceJob.py
View File

@ -334,8 +334,6 @@ class StartSliceJob(Job):
self._addRelations(changed_setting_keys, instance.definition.relations) self._addRelations(changed_setting_keys, instance.definition.relations)
Job.yieldThread() Job.yieldThread()
Logger.log("d", "changed_setting_keys=%s", changed_setting_keys)
# Ensure that the engine is aware what the build extruder is. # Ensure that the engine is aware what the build extruder is.
if stack.getProperty("machine_extruder_count", "value") > 1: if stack.getProperty("machine_extruder_count", "value") > 1:
changed_setting_keys.add("extruder_nr") changed_setting_keys.add("extruder_nr")