Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
This commit is contained in:
commit
4d1cfda14a
2 changed files with 8 additions and 3 deletions
|
@ -3851,9 +3851,9 @@ bool Plater::priv::can_reload_from_disk() const
|
||||||
for (unsigned int idx : selected_volumes_idxs)
|
for (unsigned int idx : selected_volumes_idxs)
|
||||||
{
|
{
|
||||||
const GLVolume* v = selection.get_volume(idx);
|
const GLVolume* v = selection.get_volume(idx);
|
||||||
int o_idx = v->object_idx();
|
|
||||||
int v_idx = v->volume_idx();
|
int v_idx = v->volume_idx();
|
||||||
selected_volumes.push_back({ o_idx, v_idx });
|
if (v_idx >= 0)
|
||||||
|
selected_volumes.push_back({ v->object_idx(), v_idx });
|
||||||
}
|
}
|
||||||
std::sort(selected_volumes.begin(), selected_volumes.end());
|
std::sort(selected_volumes.begin(), selected_volumes.end());
|
||||||
selected_volumes.erase(std::unique(selected_volumes.begin(), selected_volumes.end()), selected_volumes.end());
|
selected_volumes.erase(std::unique(selected_volumes.begin(), selected_volumes.end()), selected_volumes.end());
|
||||||
|
|
|
@ -2179,7 +2179,12 @@ wxWindow* BitmapChoiceRenderer::CreateEditorCtrl(wxWindow* parent, wxRect labelR
|
||||||
c_editor->SetSelection(atoi(data.GetText().c_str()));
|
c_editor->SetSelection(atoi(data.GetText().c_str()));
|
||||||
|
|
||||||
// to avoid event propagation to other sidebar items
|
// to avoid event propagation to other sidebar items
|
||||||
c_editor->Bind(wxEVT_COMBOBOX, [](wxCommandEvent& evt) { evt.StopPropagation(); });
|
c_editor->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent& evt) {
|
||||||
|
evt.StopPropagation();
|
||||||
|
// FinishEditing grabs new selection and triggers config update. We better call
|
||||||
|
// it explicitly, automatic update on KILL_FOCUS didn't work on Linux.
|
||||||
|
this->FinishEditing();
|
||||||
|
});
|
||||||
|
|
||||||
return c_editor;
|
return c_editor;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue