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

Fixed post-merge bugs

Browse source
This commit is contained in:
YuSanka 2018-06-26 13:34:25 +02:00
parent 0371f368a4
commit c1724f45c9
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/Slic3r/GUI/Plater.pm
View file

@ -1927,25 +1927,16 @@ sub on_config_change {
$self->schedule_background_process;
}
sub list_item_deselected {
my ($self, $event) = @_;
return if $PreventListEvents;
$self->{_lecursor} = Wx::BusyCursor->new();
if ($self->{list}->GetFirstSelected == -1) {
$self->select_object(undef);
$self->{canvas}->Refresh;
Slic3r::GUI::_3DScene::deselect_volumes($self->{canvas3D}) if $self->{canvas3D};
Slic3r::GUI::_3DScene::render($self->{canvas3D}) if $self->{canvas3D};
}
undef $self->{_lecursor};
}
sub item_changed_selection{
my ($self, $obj_idx) = @_;
$self->{canvas}->Refresh;
if ($self->{canvas3D}) {
my $selections = $self->collect_selections;
Slic3r::GUI::_3DScene::update_volumes_selection($self->{canvas3D}, \@$selections);
Slic3r::GUI::_3DScene::deselect_volumes($self->{canvas3D});
if ($obj_idx >= 0){
my $selections = $self->collect_selections;
Slic3r::GUI::_3DScene::update_volumes_selection($self->{canvas3D}, \@$selections);
}
Slic3r::GUI::_3DScene::render($self->{canvas3D});
}
}
@ -2077,7 +2068,9 @@ sub changed_object_settings {
$self->{print}->reload_object($obj_idx);
$self->schedule_background_process;
$self->{canvas}->reload_scene if $self->{canvas};
$self->{canvas3D}->reload_scene if $self->{canvas3D};
my $selections = $self->collect_selections;
Slic3r::GUI::_3DScene::set_objects_selections($self->{canvas3D}, \@$selections);
Slic3r::GUI::_3DScene::reload_scene($self->{canvas3D}, 0);
} else {
$self->resume_background_process;
}

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

@ -396,7 +396,7 @@ void object_ctrl_selection_changed()
part_selection_changed();
if (m_selected_object_id < 0) return;
// if (m_selected_object_id < 0) return;
if (m_event_object_selection_changed > 0) {
wxCommandEvent event(m_event_object_selection_changed);