3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source
This commit is contained in:
Enrico Turri 2018-06-27 08:26:33 +02:00
commit db95460154
4 changed files with 8 additions and 3 deletions
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) {
if ($self->{drag_object}) {
$self->{on_instances_moved}->();
Slic3r::GUI::_3DScene::reset_current_canvas();
}
$self->{drag_start_pos} = undef;
$self->{drag_object} = undef;

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

@ -279,6 +279,7 @@ sub reload_print {
my ($self, $force) = @_;
Slic3r::GUI::_3DScene::reset_volumes($self->canvas);
Slic3r::GUI::_3DScene::reset_current_canvas();
$self->_loaded(0);
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";
}
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 {
system($script, $output_file);
}

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

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