3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
Jaime van Kessel 2016-07-06 16:33:07 +02:00
commit 386cd40a03
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -127,13 +127,15 @@ class CuraEngineBackend(Backend):
## Perform a slice of the scene. ## Perform a slice of the scene.
def slice(self): def slice(self):
if not self._enabled or not self._global_container_stack: #We shouldn't be slicing.
# try again in a short time
self._change_timer.start()
return
self.printDurationMessage.emit(0, [0]) self.printDurationMessage.emit(0, [0])
self._stored_layer_data = [] self._stored_layer_data = []
if not self._enabled or not self._global_container_stack: #We shouldn't be slicing.
return
if self._slicing: #We were already slicing. Stop the old job. if self._slicing: #We were already slicing. Stop the old job.
self._terminate() self._terminate()

2
resources/materials/generic_pla.xml.fdm_material
View file

@ -9,7 +9,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
<material>PLA</material> <material>PLA</material>
<color>Generic</color> <color>Generic</color>
</name> </name>
<GUID>86a89ceb-4159-47f6-ab97-e9953803d70f</GUID> <GUID>506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9</GUID>
<version>0</version> <version>0</version>
<color_code>#00FF00</color_code> <color_code>#00FF00</color_code>
</metadata> </metadata>