Merge branch 'xs-config'

Conflicts:
	lib/Slic3r/Config.pm
	xs/MANIFEST
This commit is contained in:
Alessandro Ranellucci 2013-12-22 01:41:55 +01:00
commit ab25cc4940
19 changed files with 2370 additions and 1235 deletions

View file

@ -925,13 +925,13 @@ sub write_gcode {
$extruder->absolute_E, $extruder->extruded_volume/1000;
}
if ($Slic3r::Config->gcode_comments) {
if ($self->config->gcode_comments) {
# append full config
print $fh "\n";
foreach my $opt_key (sort keys %{$Slic3r::Config}) {
foreach my $opt_key (sort @{$self->config->get_keys}) {
next if $Slic3r::Config::Options->{$opt_key}{shortcut};
next if $Slic3r::Config::Options->{$opt_key}{gui_only};
printf $fh "; %s = %s\n", $opt_key, $Slic3r::Config->serialize($opt_key);
printf $fh "; %s = %s\n", $opt_key, $self->config->serialize($opt_key);
}
}