3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-02-14 12:49:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflict

Browse source
This commit is contained in:
ChrisTerBeke 2017-11-20 18:20:06 +01:00
commit 7556271d2b
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/GCodeReader/GCodeReader.py
View file

@ -166,8 +166,8 @@ class GCodeReader(MeshReader):
return line_width
def _gCode0(self, position, params, path):
x, y, z, f, e = position
if self._is_absolute_positioning:
x = params.x if params.x is not None else x
y = params.y if params.y is not None else y
@ -176,7 +176,7 @@ class GCodeReader(MeshReader):
x += params.x if params.x is not None else 0
y += params.y if params.y is not None else 0
z += params.z if params.z is not None else 0
f = params.f if params.f is not None else f
if params.e is not None: