Merge branch '2.1'

Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
This commit is contained in:
Ghostkeeper 2016-04-04 18:49:09 +02:00
commit 0684cee681
86 changed files with 2336 additions and 3490 deletions

View file

@ -61,11 +61,6 @@ class PlatformPhysics:
# Mark the node as outside the build volume if the bounding box test fails.
if build_volume_bounding_box.intersectsBox(bbox) != AxisAlignedBox.IntersectionResult.FullIntersection:
node._outside_buildarea = True
else:
# When printing one at a time too high objects are not printable.
if Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("print_sequence") == "one_at_a_time":
if node.getBoundingBox().height > Application.getInstance().getMachineManager().getWorkingProfile().getSettingValue("gantry_height"):
node._outside_buildarea = True
# Move it downwards if bottom is above platform
move_vector = Vector()