From f0440bede461421c5d65374a6608e5bb7278788e Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Fri, 5 Jul 2013 21:55:01 +0200 Subject: [PATCH 01/11] Move infill_every_layers infill_only_where_needed into their own "Reducing Printing Time" section --- lib/Slic3r/GUI/Tab.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm index c985e93c..44ec9c31 100644 --- a/lib/Slic3r/GUI/Tab.pm +++ b/lib/Slic3r/GUI/Tab.pm @@ -421,9 +421,13 @@ sub build { title => 'Infill', options => [qw(fill_density fill_pattern solid_fill_pattern)], }, + { + title => 'Reducing Printing Time', + options => [qw(infill_every_layers infill_only_where_needed)], + }, { title => 'Advanced', - options => [qw(infill_every_layers infill_only_where_needed solid_infill_every_layers fill_angle + options => [qw(solid_infill_every_layers fill_angle solid_infill_below_area only_retract_when_crossing_perimeters infill_first)], }, ]); From 362232ada49399794af9890bacb8b3170949df69 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Fri, 5 Jul 2013 21:57:56 +0200 Subject: [PATCH 02/11] New Quality section in GUI --- lib/Slic3r/Config.pm | 2 +- lib/Slic3r/GUI/Tab.pm | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm index a6f86e16..d8182e83 100644 --- a/lib/Slic3r/Config.pm +++ b/lib/Slic3r/Config.pm @@ -560,7 +560,7 @@ our $Options = { default => 70, }, 'extra_perimeters' => { - label => 'Generate extra perimeters when needed', + label => 'Extra perimeters if needed', tooltip => 'Add more perimeters when needed for avoiding gaps in sloping walls.', cli => 'extra-perimeters!', type => 'bool', diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm index 44ec9c31..372f3c90 100644 --- a/lib/Slic3r/GUI/Tab.pm +++ b/lib/Slic3r/GUI/Tab.pm @@ -398,7 +398,7 @@ sub build { }, { title => 'Vertical shells', - options => [qw(perimeters randomize_start extra_perimeters)], + options => [qw(perimeters)], }, { title => 'Horizontal shells', @@ -410,9 +410,13 @@ sub build { }, ], }, + { + title => 'Quality (slower slicing)', + options => [qw(extra_perimeters avoid_crossing_perimeters)], + }, { title => 'Advanced', - options => [qw(avoid_crossing_perimeters external_perimeters_first spiral_vase)], + options => [qw(randomize_start external_perimeters_first spiral_vase)], }, ]); From 0a7e0ffecfdbe6196a3d8f5f32f25f14e9cf202d Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Fri, 5 Jul 2013 22:06:58 +0200 Subject: [PATCH 03/11] New options: start_perimeters_at_concave_points start_perimeters_at_non_overhang --- lib/Slic3r/Config.pm | 14 ++++++++++++++ lib/Slic3r/GCode.pm | 11 ++++++++--- lib/Slic3r/GUI/Tab.pm | 10 +++++++++- slic3r.pl | 10 ++++++++-- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm index d8182e83..bf4119fc 100644 --- a/lib/Slic3r/Config.pm +++ b/lib/Slic3r/Config.pm @@ -573,6 +573,20 @@ our $Options = { type => 'bool', default => 0, }, + 'start_perimeters_at_concave_points' => { + label => 'Concave points', + tooltip => 'Prefer to start perimeters at a concave point.', + cli => 'start-perimeters-at-concave-points!', + type => 'bool', + default => 0, + }, + 'start_perimeters_at_non_overhang' => { + label => 'Non-overhang points', + tooltip => 'Prefer to start perimeters at non-overhanging points.', + cli => 'start-perimeters-at-non-overhang!', + type => 'bool', + default => 0, + }, 'avoid_crossing_perimeters' => { label => 'Avoid crossing perimeters', tooltip => 'Optimize travel moves in order to minimize the crossing of perimeters. This is mostly useful with Bowden extruders which suffer from oozing. This feature slows down both the print and the G-code generation.', diff --git a/lib/Slic3r/GCode.pm b/lib/Slic3r/GCode.pm index 403303d3..3bf8717a 100644 --- a/lib/Slic3r/GCode.pm +++ b/lib/Slic3r/GCode.pm @@ -155,9 +155,14 @@ sub extrude_loop { # find candidate starting points # start looking for concave vertices not being overhangs - my @concave = $loop->polygon->concave_points; - my @candidates = grep !Boost::Geometry::Utils::point_covered_by_multi_polygon($_, $self->_layer_overhangs), - @concave; + my @concave = (); + if ($Slic3r::Config->start_perimeters_at_concave_points) { + @concave = $loop->polygon->concave_points; + } + my @candidates = (); + if ($Slic3r::Config->start_perimeters_at_non_overhang) { + @candidates = grep !Boost::Geometry::Utils::point_covered_by_multi_polygon($_, $self->_layer_overhangs), @concave; + } if (!@candidates) { # if none, look for any concave vertex @candidates = @concave; diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm index 372f3c90..1a102f90 100644 --- a/lib/Slic3r/GUI/Tab.pm +++ b/lib/Slic3r/GUI/Tab.pm @@ -412,7 +412,15 @@ sub build { }, { title => 'Quality (slower slicing)', - options => [qw(extra_perimeters avoid_crossing_perimeters)], + options => [qw(extra_perimeters avoid_crossing_perimeters start_perimeters_at_concave_points start_perimeters_at_non_overhang)], + lines => [ + Slic3r::GUI::OptionsGroup->single_option_line('extra_perimeters'), + Slic3r::GUI::OptionsGroup->single_option_line('avoid_crossing_perimeters'), + { + label => 'Start perimeters at', + options => [qw(start_perimeters_at_concave_points start_perimeters_at_non_overhang)], + }, + ], }, { title => 'Advanced', diff --git a/slic3r.pl b/slic3r.pl index 0b05cd04..217e182d 100755 --- a/slic3r.pl +++ b/slic3r.pl @@ -256,9 +256,7 @@ $j home X axis [G28 X], disable motors [M84]). --layer-gcode Load layer-change G-code from the supplied file (default: nothing). --toolchange-gcode Load tool-change G-code from the supplied file (default: nothing). - --extra-perimeters Add more perimeters when needed (default: yes) --randomize-start Randomize starting point across layers (default: yes) - --avoid-crossing-perimeters Optimize travel moves so that no perimeters are crossed (default: no) --external-perimeters-first Reverse perimeter order. (default: no) --spiral-vase Experimental option to raise Z gradually when printing single-walled vases (default: no) @@ -272,6 +270,14 @@ $j Only infill under ceilings (default: no) --infill-first Make infill before perimeters (default: no) + Quality options (slower slicing): + --extra-perimeters Add more perimeters when needed (default: yes) + --avoid-crossing-perimeters Optimize travel moves so that no perimeters are crossed (default: no) + --start-perimeters-at-concave-points + Try to start perimeters at concave points if any (default: no) + --start-perimeters-at-non-overhang + Try to start perimeters at non-overhang points if any (default: no) + Support material options: --support-material Generate support material for overhangs --support-material-threshold From 282c751b0f0a0f459b7573ee738d04712677bbc8 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Fri, 5 Jul 2013 22:10:43 +0200 Subject: [PATCH 04/11] New option for disabling thin wall detection --- lib/Slic3r/Config.pm | 7 +++++++ lib/Slic3r/GUI/Tab.pm | 3 ++- lib/Slic3r/Layer/Region.pm | 2 +- slic3r.pl | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm index bf4119fc..dace84fb 100644 --- a/lib/Slic3r/Config.pm +++ b/lib/Slic3r/Config.pm @@ -587,6 +587,13 @@ our $Options = { type => 'bool', default => 0, }, + 'thin_walls' => { + label => 'Detect thin walls', + tooltip => 'Detect single-width walls (parts where two extrusions don\'t fit and we need to collapse them into a single trace).', + cli => 'thin-walls!', + type => 'bool', + default => 1, + }, 'avoid_crossing_perimeters' => { label => 'Avoid crossing perimeters', tooltip => 'Optimize travel moves in order to minimize the crossing of perimeters. This is mostly useful with Bowden extruders which suffer from oozing. This feature slows down both the print and the G-code generation.', diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm index 1a102f90..2e0feb90 100644 --- a/lib/Slic3r/GUI/Tab.pm +++ b/lib/Slic3r/GUI/Tab.pm @@ -412,7 +412,7 @@ sub build { }, { title => 'Quality (slower slicing)', - options => [qw(extra_perimeters avoid_crossing_perimeters start_perimeters_at_concave_points start_perimeters_at_non_overhang)], + options => [qw(extra_perimeters avoid_crossing_perimeters start_perimeters_at_concave_points start_perimeters_at_non_overhang thin_walls)], lines => [ Slic3r::GUI::OptionsGroup->single_option_line('extra_perimeters'), Slic3r::GUI::OptionsGroup->single_option_line('avoid_crossing_perimeters'), @@ -420,6 +420,7 @@ sub build { label => 'Start perimeters at', options => [qw(start_perimeters_at_concave_points start_perimeters_at_non_overhang)], }, + Slic3r::GUI::OptionsGroup->single_option_line('thin_walls'), ], }, { diff --git a/lib/Slic3r/Layer/Region.pm b/lib/Slic3r/Layer/Region.pm index 8ab7a5a6..3b5bfe0d 100644 --- a/lib/Slic3r/Layer/Region.pm +++ b/lib/Slic3r/Layer/Region.pm @@ -96,7 +96,7 @@ sub make_surfaces { $self->slices([ _merge_loops($loops) ]); # detect thin walls by offsetting slices by half extrusion inwards - { + if ($Slic3r::Config->thin_walls) { my $width = $self->perimeter_flow->scaled_width; my $diff = diff_ex( [ map $_->p, @{$self->slices} ], diff --git a/slic3r.pl b/slic3r.pl index 217e182d..57e58a1c 100755 --- a/slic3r.pl +++ b/slic3r.pl @@ -277,6 +277,7 @@ $j Try to start perimeters at concave points if any (default: no) --start-perimeters-at-non-overhang Try to start perimeters at non-overhang points if any (default: no) + --thin-walls Detect single-width walls (default: yes) Support material options: --support-material Generate support material for overhangs From f8ae8d3e8de9e4262959ffe2f5381df44133eda4 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Fri, 5 Jul 2013 22:12:58 +0200 Subject: [PATCH 05/11] New option to disable overhang flow --- lib/Slic3r/Config.pm | 7 +++++++ lib/Slic3r/GCode.pm | 2 +- lib/Slic3r/GUI/Tab.pm | 3 ++- slic3r.pl | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm index dace84fb..e0a06687 100644 --- a/lib/Slic3r/Config.pm +++ b/lib/Slic3r/Config.pm @@ -594,6 +594,13 @@ our $Options = { type => 'bool', default => 1, }, + 'adjust_overhang_flow' => { + label => 'Adjust overhang flow', + tooltip => 'Experimental option to adjust flow for overhangs (bridge flow will be used).', + cli => 'adjust-overhang-flow!', + type => 'bool', + default => 1, + }, 'avoid_crossing_perimeters' => { label => 'Avoid crossing perimeters', tooltip => 'Optimize travel moves in order to minimize the crossing of perimeters. This is mostly useful with Bowden extruders which suffer from oozing. This feature slows down both the print and the G-code generation.', diff --git a/lib/Slic3r/GCode.pm b/lib/Slic3r/GCode.pm index 3bf8717a..1a8fc9ea 100644 --- a/lib/Slic3r/GCode.pm +++ b/lib/Slic3r/GCode.pm @@ -197,7 +197,7 @@ sub extrude_loop { my @paths = (); # detect overhanging/bridging perimeters - if ($extrusion_path->is_perimeter && @{$self->_layer_overhangs}) { + if ($Slic3r::Config->adjust_overhang_flow && $extrusion_path->is_perimeter && @{$self->_layer_overhangs}) { # get non-overhang paths by subtracting overhangs from the loop push @paths, $extrusion_path->subtract_expolygons($self->_layer_overhangs); diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm index 2e0feb90..7f1c6987 100644 --- a/lib/Slic3r/GUI/Tab.pm +++ b/lib/Slic3r/GUI/Tab.pm @@ -412,7 +412,7 @@ sub build { }, { title => 'Quality (slower slicing)', - options => [qw(extra_perimeters avoid_crossing_perimeters start_perimeters_at_concave_points start_perimeters_at_non_overhang thin_walls)], + options => [qw(extra_perimeters avoid_crossing_perimeters start_perimeters_at_concave_points start_perimeters_at_non_overhang thin_walls adjust_overhang_flow)], lines => [ Slic3r::GUI::OptionsGroup->single_option_line('extra_perimeters'), Slic3r::GUI::OptionsGroup->single_option_line('avoid_crossing_perimeters'), @@ -421,6 +421,7 @@ sub build { options => [qw(start_perimeters_at_concave_points start_perimeters_at_non_overhang)], }, Slic3r::GUI::OptionsGroup->single_option_line('thin_walls'), + Slic3r::GUI::OptionsGroup->single_option_line('adjust_overhang_flow'), ], }, { diff --git a/slic3r.pl b/slic3r.pl index 57e58a1c..7ee2814e 100755 --- a/slic3r.pl +++ b/slic3r.pl @@ -278,6 +278,8 @@ $j --start-perimeters-at-non-overhang Try to start perimeters at non-overhang points if any (default: no) --thin-walls Detect single-width walls (default: yes) + --adjust-overhang-flow + Experimental option to use bridge flow for overhangs (default: yes) Support material options: --support-material Generate support material for overhangs From b857d796047b769bcb3e1ec3fdde3898e491367d Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Fri, 5 Jul 2013 22:23:45 +0200 Subject: [PATCH 06/11] Move spiral_vase to vertical shells section --- lib/Slic3r/GUI/Tab.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm index 7f1c6987..9a6c52e3 100644 --- a/lib/Slic3r/GUI/Tab.pm +++ b/lib/Slic3r/GUI/Tab.pm @@ -398,7 +398,7 @@ sub build { }, { title => 'Vertical shells', - options => [qw(perimeters)], + options => [qw(perimeters spiral_vase)], }, { title => 'Horizontal shells', @@ -426,7 +426,7 @@ sub build { }, { title => 'Advanced', - options => [qw(randomize_start external_perimeters_first spiral_vase)], + options => [qw(randomize_start external_perimeters_first)], }, ]); From f1978ce50a80a129b0a097f9223e24a5b7e32377 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Sat, 6 Jul 2013 02:44:32 +0200 Subject: [PATCH 07/11] Add --gui argument to Build.PL --- Build.PL | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Build.PL b/Build.PL index 128641df..45716932 100644 --- a/Build.PL +++ b/Build.PL @@ -28,6 +28,15 @@ my %recommends = qw( Growl::GNTP 0.15 XML::SAX::ExpatXS 0 ); +if ($ARGV[0] eq '--gui') { + %prereqs = (%prereqs, qw( + Wx 0.9901 + )); + %recommends = (%recommends, qw( + Wx::GLCanvas 0 + OpenGL 0 + )); +} # removed: # Wx 0.9901 @@ -80,6 +89,9 @@ If it is installed in a non-standard location you can do: EOF if !$cpanm; + # make sure our cpanm is updated (old ones don't support the ~ syntax) + system $cpanm, 'App::cpanminus'; + my %modules = (%prereqs, %recommends); foreach my $module (sort keys %modules) { my $version = $modules{$module}; From 1222f1f3e48ebc58d770f2458bba7062fe390ec1 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Sat, 6 Jul 2013 02:44:50 +0200 Subject: [PATCH 08/11] Update t/perimeters.t --- t/perimeters.t | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/perimeters.t b/t/perimeters.t index 1ce91bd3..8b83839e 100644 --- a/t/perimeters.t +++ b/t/perimeters.t @@ -73,6 +73,7 @@ use Slic3r::Test; } { + $config->set('start_perimeters_at_concave_points', 1); my $print = Slic3r::Test::init_print('L', config => $config); my $loop_starts_from_convex_point = 0; my $cur_loop; @@ -102,6 +103,7 @@ use Slic3r::Test; $config->set('fan_below_layer_time', 0); $config->set('slowdown_below_layer_time', 0); $config->set('bridge_fan_speed', 100); + $config->set('adjust_overhang_flow', 1); my $print = Slic3r::Test::init_print('overhang', config => $config); my %layer_speeds = (); # print Z => [ speeds ] my $fan_speed = 0; From 606d856af88dc0bc0cb36f0b4365b92b6fe692fc Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Sat, 6 Jul 2013 02:46:09 +0200 Subject: [PATCH 09/11] Lower case option group titles --- lib/Slic3r/GUI/Tab.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm index 9a6c52e3..ab0376b2 100644 --- a/lib/Slic3r/GUI/Tab.pm +++ b/lib/Slic3r/GUI/Tab.pm @@ -436,7 +436,7 @@ sub build { options => [qw(fill_density fill_pattern solid_fill_pattern)], }, { - title => 'Reducing Printing Time', + title => 'Reducing printing time', options => [qw(infill_every_layers infill_only_where_needed)], }, { From f455ecb7dabe31c10c4c901c87b5290686923151 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Sat, 6 Jul 2013 11:35:40 +0200 Subject: [PATCH 10/11] Rename adjust_overhang_flow to overhangs --- lib/Slic3r/Config.pm | 11 ++++++----- lib/Slic3r/GCode.pm | 2 +- lib/Slic3r/GUI/Tab.pm | 4 ++-- slic3r.pl | 4 ++-- t/perimeters.t | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm index e0a06687..faa6fc06 100644 --- a/lib/Slic3r/Config.pm +++ b/lib/Slic3r/Config.pm @@ -6,7 +6,8 @@ use utf8; use List::Util qw(first); # cemetery of old config settings -our @Ignore = qw(duplicate_x duplicate_y multiply_x multiply_y support_material_tool acceleration); +our @Ignore = qw(duplicate_x duplicate_y multiply_x multiply_y support_material_tool acceleration + adjust_overhang_flow); my $serialize_comma = sub { join ',', @{$_[0]} }; my $serialize_comma_bool = sub { join ',', map $_ // 0, @{$_[0]} }; @@ -594,10 +595,10 @@ our $Options = { type => 'bool', default => 1, }, - 'adjust_overhang_flow' => { - label => 'Adjust overhang flow', - tooltip => 'Experimental option to adjust flow for overhangs (bridge flow will be used).', - cli => 'adjust-overhang-flow!', + 'overhangs' => { + label => 'Detect overhangs', + tooltip => 'Experimental option to adjust flow for overhangs (bridge flow will be used), to apply bridge speed to them and enable fan.', + cli => 'overhangs!', type => 'bool', default => 1, }, diff --git a/lib/Slic3r/GCode.pm b/lib/Slic3r/GCode.pm index 1a8fc9ea..d4e498a9 100644 --- a/lib/Slic3r/GCode.pm +++ b/lib/Slic3r/GCode.pm @@ -197,7 +197,7 @@ sub extrude_loop { my @paths = (); # detect overhanging/bridging perimeters - if ($Slic3r::Config->adjust_overhang_flow && $extrusion_path->is_perimeter && @{$self->_layer_overhangs}) { + if ($Slic3r::Config->overhangs && $extrusion_path->is_perimeter && @{$self->_layer_overhangs}) { # get non-overhang paths by subtracting overhangs from the loop push @paths, $extrusion_path->subtract_expolygons($self->_layer_overhangs); diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm index ab0376b2..27ff3c56 100644 --- a/lib/Slic3r/GUI/Tab.pm +++ b/lib/Slic3r/GUI/Tab.pm @@ -412,7 +412,7 @@ sub build { }, { title => 'Quality (slower slicing)', - options => [qw(extra_perimeters avoid_crossing_perimeters start_perimeters_at_concave_points start_perimeters_at_non_overhang thin_walls adjust_overhang_flow)], + options => [qw(extra_perimeters avoid_crossing_perimeters start_perimeters_at_concave_points start_perimeters_at_non_overhang thin_walls overhangs)], lines => [ Slic3r::GUI::OptionsGroup->single_option_line('extra_perimeters'), Slic3r::GUI::OptionsGroup->single_option_line('avoid_crossing_perimeters'), @@ -421,7 +421,7 @@ sub build { options => [qw(start_perimeters_at_concave_points start_perimeters_at_non_overhang)], }, Slic3r::GUI::OptionsGroup->single_option_line('thin_walls'), - Slic3r::GUI::OptionsGroup->single_option_line('adjust_overhang_flow'), + Slic3r::GUI::OptionsGroup->single_option_line('overhangs'), ], }, { diff --git a/slic3r.pl b/slic3r.pl index 7ee2814e..ddd6367a 100755 --- a/slic3r.pl +++ b/slic3r.pl @@ -278,8 +278,8 @@ $j --start-perimeters-at-non-overhang Try to start perimeters at non-overhang points if any (default: no) --thin-walls Detect single-width walls (default: yes) - --adjust-overhang-flow - Experimental option to use bridge flow for overhangs (default: yes) + --overhangs Experimental option to use bridge flow, speed and fan for overhangs + (default: yes) Support material options: --support-material Generate support material for overhangs diff --git a/t/perimeters.t b/t/perimeters.t index 8b83839e..1dacd31c 100644 --- a/t/perimeters.t +++ b/t/perimeters.t @@ -103,7 +103,7 @@ use Slic3r::Test; $config->set('fan_below_layer_time', 0); $config->set('slowdown_below_layer_time', 0); $config->set('bridge_fan_speed', 100); - $config->set('adjust_overhang_flow', 1); + $config->set('overhangs', 1); my $print = Slic3r::Test::init_print('overhang', config => $config); my %layer_speeds = (); # print Z => [ speeds ] my $fan_speed = 0; From 2ecc31c0aa99405bbfbb279249ae76365565f47d Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Sat, 6 Jul 2013 11:37:24 +0200 Subject: [PATCH 11/11] Only work on GUI modules when --gui is supplied to Build.PL --- Build.PL | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Build.PL b/Build.PL index 45716932..60414700 100644 --- a/Build.PL +++ b/Build.PL @@ -29,18 +29,15 @@ my %recommends = qw( XML::SAX::ExpatXS 0 ); if ($ARGV[0] eq '--gui') { - %prereqs = (%prereqs, qw( + %prereqs = qw( Wx 0.9901 - )); - %recommends = (%recommends, qw( + ); + %recommends = qw( Wx::GLCanvas 0 OpenGL 0 - )); + ); } -# removed: -# Wx 0.9901 - my $missing_prereqs = 0; if ($ENV{SLIC3R_NO_AUTO}) { foreach my $module (sort keys %prereqs) {