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

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

Browse Source
This commit is contained in:
Jaime van Kessel 2016-11-29 15:41:46 +01:00
commit 292d075a03
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/CuraEngineBackend/StartSliceJob.py
View File

@ -163,22 +163,17 @@ class StartSliceJob(Job):
obj.id = id(object) obj.id = id(object)
verts = mesh_data.getVertices() verts = mesh_data.getVertices()
indices = mesh_data.getIndices() indices = mesh_data.getIndices()
if indices is not None: if indices is not None:
#TODO: This is a very slow way of doing it! It also locks up the GUI. flat_verts = numpy.take(verts, indices.flatten(), axis=0)
flat_vert_list = []
for face in indices:
for vert_index in face:
flat_vert_list.append(verts[vert_index])
Job.yieldThread()
verts = numpy.array(flat_vert_list)
else: else:
verts = numpy.array(verts) flat_verts = numpy.array(verts)
# Convert from Y up axes to Z up axes. Equals a 90 degree rotation. # Convert from Y up axes to Z up axes. Equals a 90 degree rotation.
verts[:, [1, 2]] = verts[:, [2, 1]] flat_verts[:, [1, 2]] = flat_verts[:, [2, 1]]
verts[:, 1] *= -1 flat_verts[:, 1] *= -1
obj.vertices = verts obj.vertices = flat_verts
self._handlePerObjectSettings(object, obj) self._handlePerObjectSettings(object, obj)

1
resources/definitions/fdmprinter.def.json
View File

@ -3643,7 +3643,6 @@
"type": "category", "type": "category",
"icon": "category_dual", "icon": "category_dual",
"description": "Settings used for printing with multiple extruders.", "description": "Settings used for printing with multiple extruders.",
"enabled": "machine_extruder_count > 1",
"children": "children":
{ {
"prime_tower_enable": "prime_tower_enable":