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

This commit is contained in:
Ghostkeeper 2017-06-29 13:45:02 +02:00
commit 53e35daf02
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75

View file

@ -727,9 +727,11 @@ class BuildVolume(SceneNode):
offset_x = extruder.getProperty("machine_nozzle_offset_x", "value")
if offset_x is None:
offset_x = 0
offset_y = -extruder.getProperty("machine_nozzle_offset_y", "value")
offset_y = extruder.getProperty("machine_nozzle_offset_y", "value")
if offset_y is None:
offset_y = 0
else:
offset_y = -offset_y
result[extruder_id] = []
for polygon in machine_disallowed_polygons: