3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-23 08:41:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Attempt to solve conflict with a3bd1b5 by adding id to PrintObject and using that as a hash key.

Browse source
This commit is contained in:
Y. Sapir 2014-05-25 02:37:42 +03:00
parent 9247f21ff8
commit 19d18bdd84
4 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xs/src/Print.hpp
View file

@ -90,6 +90,7 @@ class PrintObject
Print* print();
int id();
ModelObject* model_object();
// adds region_id, too, if necessary
@ -111,11 +112,12 @@ class PrintObject
private:
Print* _print;
int _id;
ModelObject* _model_object;
// TODO: call model_object->get_bounding_box() instead of accepting
// parameter
PrintObject(Print* print, ModelObject* model_object,
PrintObject(Print* print, int id, ModelObject* model_object,
const BoundingBoxf3 &modobj_bbox);
virtual ~PrintObject();
};