mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-07 23:17:35 -06:00
Merge some BS1.7 changes:
Port object canceling for BL X1 from BS. Todo: refactor
This commit is contained in:
parent
3acd89e877
commit
7ece35931e
15 changed files with 557 additions and 162 deletions
|
@ -1220,9 +1220,18 @@ public:
|
|||
ModelInstanceEPrintVolumeState print_volume_state;
|
||||
// Whether or not this instance is printable
|
||||
bool printable;
|
||||
bool use_loaded_id_for_label {false};
|
||||
int arrange_order = 0; // BBS
|
||||
size_t loaded_id = 0; // BBS
|
||||
|
||||
size_t get_labeled_id() const
|
||||
{
|
||||
if (use_loaded_id_for_label && (loaded_id > 0))
|
||||
return loaded_id;
|
||||
else
|
||||
return id().id;
|
||||
}
|
||||
|
||||
ModelObject* get_object() const { return this->object; }
|
||||
|
||||
const Geometry::Transformation& get_transformation() const { return m_transformation; }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue