public_mirrors/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-11 08:04:25 +00:00
Code Issues Activity

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

Browse Source
This commit is contained in:
Enrico Turri
2018-05-21 13:06:16 +02:00
parent ad5eab8fd7 64b905820d
commit 3fb96ff636
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Slic3r/GUI/Plater.pm
+1
View File
@@ -236,6 +236,7 @@ sub new {
### Scrolled Window for info boxes
my $scrolled_window_sizer = Wx::BoxSizer->new(wxVERTICAL);
$scrolled_window_sizer->SetMinSize([310, -1]);
my $scrolled_window_panel = Wx::ScrolledWindow->new($self->{right_panel}, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
$scrolled_window_panel->SetSizer($scrolled_window_sizer);
$scrolled_window_panel->SetScrollbars(1, 1, 1, 1);
lib/Slic3r/GUI/Plater/3D.pm
+1 -1
View File
@@ -248,7 +248,7 @@ sub reload_scene {
$self->set_warning_enabled(0);
$self->volumes->update_outside_state($self->{config}, 1);
Slic3r::GUI::_3DScene::reset_warning_texture();
$self->on_enable_action_buttons->(1) if ($self->on_enable_action_buttons);
$self->on_enable_action_buttons->(scalar @{$self->{model}->objects} > 0) if ($self->on_enable_action_buttons);
}
} else {
$self->set_warning_enabled(0);