mirror of
https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git
synced 2025-08-15 22:05:53 +08:00
fix an undo/redo bug for plate name
This commit is contained in:
parent
65963b465b
commit
51ef90c54e
@ -444,7 +444,7 @@ public:
|
|||||||
std::vector<std::pair<int, int>> objects_and_instances;
|
std::vector<std::pair<int, int>> objects_and_instances;
|
||||||
std::vector<std::pair<int, int>> instances_outside;
|
std::vector<std::pair<int, int>> instances_outside;
|
||||||
|
|
||||||
ar(m_plate_index, m_print_index, m_origin, m_width, m_depth, m_height, m_locked, m_selected, m_ready_for_slice, m_slice_result_valid, m_apply_invalid, m_printable, m_tmp_gcode_path, objects_and_instances, instances_outside, m_config);
|
ar(m_plate_index, m_name, m_print_index, m_origin, m_width, m_depth, m_height, m_locked, m_selected, m_ready_for_slice, m_slice_result_valid, m_apply_invalid, m_printable, m_tmp_gcode_path, objects_and_instances, instances_outside, m_config);
|
||||||
|
|
||||||
for (std::vector<std::pair<int, int>>::iterator it = objects_and_instances.begin(); it != objects_and_instances.end(); ++it)
|
for (std::vector<std::pair<int, int>>::iterator it = objects_and_instances.begin(); it != objects_and_instances.end(); ++it)
|
||||||
obj_to_instance_set.insert(std::pair(it->first, it->second));
|
obj_to_instance_set.insert(std::pair(it->first, it->second));
|
||||||
@ -462,7 +462,7 @@ public:
|
|||||||
for (std::set<std::pair<int, int>>::iterator it = obj_to_instance_set.begin(); it != obj_to_instance_set.end(); ++it)
|
for (std::set<std::pair<int, int>>::iterator it = obj_to_instance_set.begin(); it != obj_to_instance_set.end(); ++it)
|
||||||
objects_and_instances.emplace_back(it->first, it->second);
|
objects_and_instances.emplace_back(it->first, it->second);
|
||||||
|
|
||||||
ar(m_plate_index, m_print_index, m_origin, m_width, m_depth, m_height, m_locked, m_selected, m_ready_for_slice, m_slice_result_valid, m_apply_invalid, m_printable, m_tmp_gcode_path, objects_and_instances, instances_outside, m_config);
|
ar(m_plate_index, m_name, m_print_index, m_origin, m_width, m_depth, m_height, m_locked, m_selected, m_ready_for_slice, m_slice_result_valid, m_apply_invalid, m_printable, m_tmp_gcode_path, objects_and_instances, instances_outside, m_config);
|
||||||
}
|
}
|
||||||
/*template<class Archive> void serialize(Archive& ar)
|
/*template<class Archive> void serialize(Archive& ar)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user