mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-10 16:27:54 -06:00
Merge branch 'dev_native' of github.com:prusa3d/Slic3r into dev_native
This commit is contained in:
commit
73eb31d43c
17 changed files with 265 additions and 378 deletions
|
@ -692,14 +692,15 @@ void Sidebar::update_objects_list_extruder_column(int extruders_count)
|
|||
void Sidebar::show_info_sizer()
|
||||
{
|
||||
if (!p->plater->is_single_full_object_selection() ||
|
||||
m_mode < ConfigMenuModeExpert ) {
|
||||
m_mode < ConfigMenuModeExpert ||
|
||||
p->plater->model().objects.empty()) {
|
||||
p->object_info->Show(false);
|
||||
return;
|
||||
}
|
||||
|
||||
int obj_idx = p->plater->get_selected_object_idx();
|
||||
|
||||
const ModelObject* model_object = (*wxGetApp().model_objects())[obj_idx];
|
||||
const ModelObject* model_object = p->plater->model().objects[obj_idx];
|
||||
// hack to avoid crash when deleting the last object on the bed
|
||||
if (model_object->volumes.empty())
|
||||
{
|
||||
|
@ -1470,6 +1471,8 @@ void Plater::priv::remove(size_t obj_idx)
|
|||
void Plater::priv::delete_object_from_model(size_t obj_idx)
|
||||
{
|
||||
model.delete_object(obj_idx);
|
||||
object_list_changed();
|
||||
update();
|
||||
}
|
||||
|
||||
void Plater::priv::reset()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue