diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2018-06-27 13:49:38 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2018-06-27 13:49:38 +0300 |
| commit | 06f44a9e4b7962e910f3c9a65276b04ffe160e37 (patch) | |
| tree | a1c5bb48dd59a383f8a85474e632ecc45feb6037 /lib | |
| parent | 8db4fdc24c2fa17f359065038f738e032db23d92 (diff) | |
Code cleanupubuntu_opengl_fix
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Slic3r/GUI/Plater.pm | 16 | ||||
| -rw-r--r-- | lib/Slic3r/GUI/Plater/3DPreview.pm | 3 |
2 files changed, 0 insertions, 19 deletions
diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index 47a060e47..2b0a5a0d5 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -186,9 +186,6 @@ sub new { # Initialize 3D toolpaths preview if ($Slic3r::GUI::have_OpenGL) { $self->{preview3D} = Slic3r::GUI::Plater::3DPreview->new($self->{preview_notebook}, $self->{print}, $self->{gcode_preview_data}, $self->{config}); -#================================================================================================================== -# Slic3r::GUI::_3DScene::set_active($self->{preview3D}->canvas, 0); -#================================================================================================================== Slic3r::GUI::_3DScene::enable_legend_texture($self->{preview3D}->canvas, 1); Slic3r::GUI::_3DScene::register_on_viewport_changed_callback($self->{preview3D}->canvas, sub { Slic3r::GUI::_3DScene::set_viewport_from_scene($self->{canvas3D}, $self->{preview3D}->canvas); }); $self->{preview_notebook}->AddPage($self->{preview3D}, L('Preview')); @@ -204,25 +201,12 @@ sub new { EVT_NOTEBOOK_PAGE_CHANGED($self, $self->{preview_notebook}, sub { my $preview = $self->{preview_notebook}->GetCurrentPage; if (($preview != $self->{preview3D}) && ($preview != $self->{canvas3D})) { -#================================================================================================================== -# Slic3r::GUI::_3DScene::set_active($self->{preview3D}->canvas, 0); -# Slic3r::GUI::_3DScene::set_active($self->{canvas3D}, 0); -# Slic3r::GUI::_3DScene::reset_current_canvas(); -#================================================================================================================== $preview->OnActivate if $preview->can('OnActivate'); } elsif ($preview == $self->{preview3D}) { -#================================================================================================================== -# Slic3r::GUI::_3DScene::set_active($self->{preview3D}->canvas, 1); -# Slic3r::GUI::_3DScene::set_active($self->{canvas3D}, 0); -#================================================================================================================== $self->{preview3D}->load_print; # sets the canvas as dirty to force a render at the 1st idle event (wxWidgets IsShownOnScreen() is buggy and cannot be used reliably) Slic3r::GUI::_3DScene::set_as_dirty($self->{preview3D}->canvas); } elsif ($preview == $self->{canvas3D}) { -#================================================================================================================== -# Slic3r::GUI::_3DScene::set_active($self->{canvas3D}, 1); -# Slic3r::GUI::_3DScene::set_active($self->{preview3D}->canvas, 0); -#================================================================================================================== if (Slic3r::GUI::_3DScene::is_reload_delayed($self->{canvas3D})) { my $selections = $self->collect_selections; Slic3r::GUI::_3DScene::set_objects_selections($self->{canvas3D}, \@$selections); diff --git a/lib/Slic3r/GUI/Plater/3DPreview.pm b/lib/Slic3r/GUI/Plater/3DPreview.pm index 9a470e017..9ed2374ec 100644 --- a/lib/Slic3r/GUI/Plater/3DPreview.pm +++ b/lib/Slic3r/GUI/Plater/3DPreview.pm @@ -279,9 +279,6 @@ 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) { |