3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 07:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

Merge branch 15.10 into master

Browse source 
Where automatic merging failed, the version of 15.10 was used.
This commit is contained in:
Ghostkeeper 2015-10-16 16:56:59 +02:00
commit da1d59ff98
19 changed files with 383 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/LayerData.py
View file

@ -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)