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

Merge branch 'master' into CURA-4234_expand_collapse

Browse source
This commit is contained in:
Aleksei S 2017-12-14 09:42:05 +01:00
commit 497bc756b7
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -131,19 +131,19 @@ class StartSliceJob(Job):
Logger.log("w", "No objects suitable for one at a time found, or no correct order found")
else:
temp_list = []
is_non_printing_mesh = False
has_printing_mesh = False
for node in DepthFirstIterator(self._scene.getRoot()):
if type(node) is SceneNode and node.getMeshData() and node.getMeshData().getVertices() is not None:
_non_printing_mesh = getattr(node, "_non_printing_mesh", False)
if not getattr(node, "_outside_buildarea", False) or _non_printing_mesh:
temp_list.append(node)
if _non_printing_mesh:
is_non_printing_mesh = True
if not _non_printing_mesh:
has_printing_mesh = True
Job.yieldThread()
#If list has one node and it has non printing settings then remove it from list
#If the list doesn't have any model with suitable settings then clean the list
# otherwise CuraEngine will crash
if len(temp_list) == 1 and is_non_printing_mesh:
if not has_printing_mesh:
temp_list.clear()
if temp_list:

2
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -737,7 +737,7 @@ class XmlMaterialProfile(InstanceContainer):
Logger.log("w", "No definition found for machine ID %s", machine_id)
continue
Logger.log("d", "========= Found def for machine [%s]", machine_id)
Logger.log("d", "Found def for machine [%s]", machine_id)
definition_metadata = definition_metadata[0]
machine_manufacturer = identifier.get("manufacturer", definition_metadata.get("manufacturer", "Unknown")) #If the XML material doesn't specify a manufacturer, use the one in the actual printer definition.