mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Fixed Canvas3D update after an object instance is deleted.
This commit is contained in:
parent
60f870bbd9
commit
96e14b5d3b
4 changed files with 1 additions and 13 deletions
|
@ -699,14 +699,6 @@ void ModelObject::clear_volumes()
|
||||||
this->invalidate_bounding_box();
|
this->invalidate_bounding_box();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ModelObject::reset_volumes_idxs()
|
|
||||||
{
|
|
||||||
for (ModelVolume *v : this->volumes)
|
|
||||||
{
|
|
||||||
v->set_new_unique_id();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ModelInstance* ModelObject::add_instance()
|
ModelInstance* ModelObject::add_instance()
|
||||||
{
|
{
|
||||||
ModelInstance* i = new ModelInstance(this);
|
ModelInstance* i = new ModelInstance(this);
|
||||||
|
|
|
@ -200,9 +200,6 @@ public:
|
||||||
void clear_volumes();
|
void clear_volumes();
|
||||||
bool is_multiparts() const { return volumes.size() > 1; }
|
bool is_multiparts() const { return volumes.size() > 1; }
|
||||||
|
|
||||||
// set a new unique id to all volumes
|
|
||||||
void reset_volumes_idxs();
|
|
||||||
|
|
||||||
ModelInstance* add_instance();
|
ModelInstance* add_instance();
|
||||||
ModelInstance* add_instance(const ModelInstance &instance);
|
ModelInstance* add_instance(const ModelInstance &instance);
|
||||||
ModelInstance* add_instance(const Vec3d &offset, const Vec3d &scaling_factor, const Vec3d &rotation);
|
ModelInstance* add_instance(const Vec3d &offset, const Vec3d &scaling_factor, const Vec3d &rotation);
|
||||||
|
|
|
@ -4087,7 +4087,7 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
|
||||||
volume->extruder_id = extruder_id;
|
volume->extruder_id = extruder_id;
|
||||||
|
|
||||||
// updates volumes transformations
|
// updates volumes transformations
|
||||||
volume->set_instance_transformation(mvs->model_volume->get_object()->instances[volume->instance_idx()]->get_transformation());
|
volume->set_instance_transformation(mvs->model_volume->get_object()->instances[mvs->composite_id.instance_id]->get_transformation());
|
||||||
volume->set_volume_transformation(mvs->model_volume->get_transformation());
|
volume->set_volume_transformation(mvs->model_volume->get_transformation());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -946,7 +946,6 @@ bool ObjectList::del_subobject_from_object(const int obj_idx, const int idx, con
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
(*m_objects)[obj_idx]->delete_instance(idx);
|
(*m_objects)[obj_idx]->delete_instance(idx);
|
||||||
(*m_objects)[obj_idx]->reset_volumes_idxs();
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue