diff options
| author | Ghostkeeper <ghost_keeper+github@hotmail.com> | 2015-10-16 17:56:59 +0300 |
|---|---|---|
| committer | Ghostkeeper <ghost_keeper+github@hotmail.com> | 2015-10-16 17:56:59 +0300 |
| commit | da1d59ff98c6845ef0e9417328905f7bd7bd4494 (patch) | |
| tree | 58d7115001723c0dcd1949f82358b69cb875890e /cura/LayerData.py | |
| parent | a07e99a9f308830a1e4e1c3f9028efe1e666bea7 (diff) | |
| parent | 886083d2eb83ae5d0a4b12550b16cbc123079b57 (diff) | |
Merge branch 15.10 into master
Where automatic merging failed, the version of 15.10 was used.
Diffstat (limited to 'cura/LayerData.py')
| -rw-r--r-- | cura/LayerData.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cura/LayerData.py b/cura/LayerData.py index fdcfca7631..eb8f5553ad 100644 --- a/cura/LayerData.py +++ b/cura/LayerData.py @@ -107,7 +107,7 @@ class Layer(): def build(self, offset, vertices, colors, indices): result = offset for polygon in self._polygons: - if polygon._type == Polygon.InfillType or polygon.type == Polygon.MoveCombingType or polygon.type == Polygon.MoveRetractionType: + if polygon.type == Polygon.InfillType or polygon.type == Polygon.MoveCombingType or polygon.type == Polygon.MoveRetractionType: continue polygon.build(result, vertices, colors, indices) @@ -238,7 +238,7 @@ class Polygon(): elif self._type == self.MoveCombingType: return Color(0.0, 0.0, 1.0, 1.0) elif self._type == self.MoveRetractionType: - return Color(0.0, 1.0, 1.0, 1.0) + return Color(0.5, 0.5, 1.0, 1.0) else: return Color(1.0, 1.0, 1.0, 1.0) |