3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate

Browse Source
This commit is contained in:
Enrico Turri 2018-06-27 08:26:55 +02:00
commit dc223066d3
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Slic3r/GUI/Plater/2D.pm
View File

@ -233,7 +233,6 @@ sub mouse_event {
} elsif ($event->LeftUp) { } elsif ($event->LeftUp) {
if ($self->{drag_object}) { if ($self->{drag_object}) {
$self->{on_instances_moved}->(); $self->{on_instances_moved}->();
Slic3r::GUI::_3DScene::reset_current_canvas();
} }
$self->{drag_start_pos} = undef; $self->{drag_start_pos} = undef;
$self->{drag_object} = undef; $self->{drag_object} = undef;

1
lib/Slic3r/GUI/Plater/3DPreview.pm
View File

@ -279,6 +279,7 @@ sub reload_print {
my ($self, $force) = @_; my ($self, $force) = @_;
Slic3r::GUI::_3DScene::reset_volumes($self->canvas); Slic3r::GUI::_3DScene::reset_volumes($self->canvas);
Slic3r::GUI::_3DScene::reset_current_canvas();
$self->_loaded(0); $self->_loaded(0);
if (! $self->IsShown && ! $force) { if (! $self->IsShown && ! $force) {

7
lib/Slic3r/Print.pm
View File

@ -101,7 +101,12 @@ sub export_gcode {
die "The configured post-processing script is not executable: check permissions. ($script)\n"; die "The configured post-processing script is not executable: check permissions. ($script)\n";
} }
if ($^O eq 'MSWin32' && $script =~ /\.[pP][lL]/) { if ($^O eq 'MSWin32' && $script =~ /\.[pP][lL]/) {
system($^X, $script, $output_file); # The current process (^X) may be slic3r.exe or slic3r-console.exe.
# Replace it with the current perl interpreter.
my($filename, $directories, $suffix) = fileparse($^X);
$filename =~ s/^slic3r.*$/perl5\.24\.0\.exe/;
my $interpreter = $directories . $filename;
system($interpreter, $script, $output_file);
} else { } else {
system($script, $output_file); system($script, $output_file);
} }

2
xs/src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -2376,7 +2376,7 @@ void GLCanvas3D::load_gcode_preview(const GCodePreviewData& preview_data, const
if ((m_canvas != nullptr) && (m_print != nullptr)) if ((m_canvas != nullptr) && (m_print != nullptr))
{ {
// ensures that this canvas is current // ensures that this canvas is current
if (!_3DScene::set_current(m_canvas, false)) if (!_3DScene::set_current(m_canvas, true))
return; return;
if (m_volumes.empty()) if (m_volumes.empty())