Load files into the GUI when supplying them as command line arguments along with the --gui switch. #2644

1 files changed, 6 insertions, 1 deletions

diff --git a/slic3r.pl b/slic3r.pl
index 84590b197..d83b18f7f 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -90,7 +90,7 @@ $config->apply($cli_config);
 
 # launch GUI
 my $gui;
-if (!@ARGV && !$opt{save} && eval "require Slic3r::GUI; 1") {
+if ((!@ARGV || $opt{gui}) && !$opt{save} && eval "require Slic3r::GUI; 1") {
     {
         no warnings 'once';
         $Slic3r::GUI::datadir   = Slic3r::decode_path($opt{datadir});
@@ -102,6 +102,9 @@ if (!@ARGV && !$opt{save} && eval "require Slic3r::GUI; 1") {
     setlocale(LC_NUMERIC, 'C');
     $gui->{mainframe}->load_config_file($_) for @{$opt{load}};
     $gui->{mainframe}->load_config($cli_config);
+    foreach my $input_file (@ARGV) {
+        $gui->{mainframe}{plater}->load_file($input_file) unless $opt{no_plater};
+    }
     $gui->MainLoop;
     exit;
 }
@@ -261,6 +264,8 @@ Usage: slic3r.pl [ OPTIONS ] [ file.stl ] [ file2.stl ] ...
     
 $j
   GUI options:
+    --gui               Forces the GUI launch instead of command line slicing (if you
+                        supply a model file, it will be loaded into the plater)
     --no-plater         Disable the plater tab
     --gui-mode          Overrides the configured mode (simple/expert)
     --autosave <file>   Automatically export current configuration to the specified file