Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators

This commit is contained in:
Enrico Turri 2018-06-25 08:51:38 +02:00
commit 663bc20d1b

View File

@ -433,6 +433,7 @@ std::vector<int> GLVolumeCollection::load_object(
v.extruder_id = extruder_id; v.extruder_id = extruder_id;
} }
v.is_modifier = model_volume->modifier; v.is_modifier = model_volume->modifier;
v.outside_printer_detection_enabled = !model_volume->modifier;
} }
} }
@ -663,7 +664,7 @@ bool GLVolumeCollection::check_outside_state(const DynamicPrintConfig* config)
bool contained = true; bool contained = true;
for (GLVolume* volume : this->volumes) for (GLVolume* volume : this->volumes)
{ {
if (volume != nullptr) if ((volume != nullptr) && !volume->is_modifier)
{ {
bool state = print_volume.contains(volume->transformed_bounding_box()); bool state = print_volume.contains(volume->transformed_bounding_box());
contained &= state; contained &= state;