Merge branch 'xs-reload-object'

Conflicts:
	lib/Slic3r/Print.pm
This commit is contained in:
Alessandro Ranellucci 2014-11-12 22:51:48 +01:00
commit a5787cfb04
4 changed files with 26 additions and 14 deletions

View file

@ -116,6 +116,30 @@ Print::delete_object(size_t idx)
this->state.invalidate(psBrim);
}
void
Print::reload_object(size_t idx)
{
/* TODO: this method should check whether the per-object config and per-material configs
have changed in such a way that regions need to be rearranged or we can just apply
the diff and invalidate something. Same logic as apply_config()
For now we just re-add all objects since we haven't implemented this incremental logic yet.
This should also check whether object volumes (parts) have changed. */
// collect all current model objects
ModelObjectPtrs model_objects;
FOREACH_OBJECT(this, object) {
model_objects.push_back((*object)->model_object());
}
// remove our print objects
this->clear_objects();
// re-add model objects
for (ModelObjectPtrs::iterator it = model_objects.begin(); it != model_objects.end(); ++it) {
this->add_model_object(*it);
}
}
void
Print::clear_regions()
{