From 02356fd613e495934036cd36c5177325fd797b10 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Sat, 22 Sep 2012 19:04:36 +0200
Subject: Large refactoring to allow processing multimaterial files

---
 slic3r.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'slic3r.pl')

diff --git a/slic3r.pl b/slic3r.pl
index e5c63b99e..7fe0aa0a0 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -88,9 +88,9 @@ if (@ARGV) {  # slicing from command line
     
     while (my $input_file = shift @ARGV) {
         my $print = Slic3r::Print->new(config => $config);
-        $print->add_objects_from_file($input_file);
+        $print->add_model(Slic3r::Model->read_from_file($input_file));
         if ($opt{merge}) {
-            $print->add_objects_from_file($_) for splice @ARGV, 0;
+            $print->add_model(Slic3r::Model->read_from_file($_)) for splice @ARGV, 0;
         }
         $print->duplicate;
         $print->arrange_objects if @{$print->objects} > 1;
-- 
cgit v1.2.3