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

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

Browse Source
This commit is contained in:
fieldOfView 2016-09-19 14:34:50 +02:00
commit 2e7dbea559
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/BuildVolume.py
View File

@ -367,8 +367,6 @@ class BuildVolume(SceneNode):
areas.append(poly)
if self._prime_tower_area:
self._prime_tower_area = self._prime_tower_area.getMinkowskiHull(Polygon(approximatedCircleVertices(bed_adhesion_size)))
# Add the skirt areas around the borders of the build plate.
if bed_adhesion_size > 0:
@ -409,6 +407,8 @@ class BuildVolume(SceneNode):
collision = False
if self._prime_tower_area:
for area in areas:
# Using Minkowski of 0 fixes the prime tower area so it's rendered correctly
self._prime_tower_area = self._prime_tower_area.getMinkowskiHull(Polygon(approximatedCircleVertices(0)))
if self._prime_tower_area.intersectsPolygon(area) is not None:
collision = True
break

3
plugins/LegacyProfileReader/LegacyProfileReader.py
View File

@ -130,5 +130,6 @@ class LegacyProfileReader(ProfileReader):
if len(profile.getAllKeys()) == 0:
Logger.log("i", "A legacy profile was imported but everything evaluates to the defaults, creating an empty profile.")
profile.setDirty(True)
profile.addMetaDataEntry("type", "quality")
profile.addMetaDataEntry("type", "quality_changes")
profile.addMetaDataEntry("quality", "normal")
return profile