Merge branch 'master' into dynamic-flow

Conflicts:
	lib/Slic3r/ExPolygon.pm
This commit is contained in:
Alessandro Ranellucci 2012-09-12 16:05:06 +02:00
commit 1cedb00f20
34 changed files with 529 additions and 260 deletions

View file

@ -170,7 +170,7 @@ sub make_fill {
? ($surface->surface_type == S_TYPE_TOP ? EXTR_ROLE_TOPSOLIDFILL : EXTR_ROLE_SOLIDFILL)
: EXTR_ROLE_FILL),
depth_layers => $surface->depth_layers,
flow_spacing => $params->{flow_spacing} || $flow_spacing,
flow_spacing => $params->{flow_spacing} || (warn "Warning: no flow_spacing was returned by the infill engine, please report this to the developer\n"),
), @paths,
],
);