3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed conflict after merge with master

Browse source
This commit is contained in:
Enrico Turri 2018-06-25 10:49:30 +02:00
commit 789a760fbd
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xs/src/slic3r/GUI/3DScene.cpp
View file

@ -638,6 +638,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;
v.set_origin(Pointf3(instance->offset.x, instance->offset.y, 0.0)); v.set_origin(Pointf3(instance->offset.x, instance->offset.y, 0.0));
v.set_angle_z(instance->rotation); v.set_angle_z(instance->rotation);
v.set_scale_factor(instance->scaling_factor); v.set_scale_factor(instance->scaling_factor);
@ -759,7 +760,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;