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

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
Show Stats 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 return line_width
def _gCode0(self, position, params, path): def _gCode0(self, position, params, path):
x, y, z, f, e = position x, y, z, f, e = position
if self._is_absolute_positioning: if self._is_absolute_positioning:
x = params.x if params.x is not None else x x = params.x if params.x is not None else x
y = params.y if params.y is not None else y 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 x += params.x if params.x is not None else 0
y += params.y if params.y 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 z += params.z if params.z is not None else 0
f = params.f if params.f is not None else f f = params.f if params.f is not None else f
if params.e is not None: if params.e is not None: