GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-18 12:44:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix object-skirt & brim for preview

Browse Source
This commit is contained in:
supermerill 2021-08-22 17:47:55 +02:00
parent e106dd555c
commit ff153356c3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -5801,9 +5801,11 @@ void GLCanvas3D::_load_print_toolpaths()
//skirt & brim from objects //skirt & brim from objects
for (const PrintObject* print_object : print->objects()) { for (const PrintObject* print_object : print->objects()) {
if (!print_object->brim().empty()) if (!print_object->brim().empty())
_3DScene::extrusionentity_to_verts(print_object->brim(), print_zs[i], Point(0, 0), *volume); for(const PrintInstance& inst : print_object->instances())
_3DScene::extrusionentity_to_verts(print_object->brim(), print_zs[i], inst.shift, *volume);
if (print_object->skirt_first_layer()) if (print_object->skirt_first_layer())
_3DScene::extrusionentity_to_verts(*print_object->skirt_first_layer(), print_zs[i], Point(0, 0), *volume); for (const PrintInstance& inst : print_object->instances())
_3DScene::extrusionentity_to_verts(*print_object->skirt_first_layer(), print_zs[i], inst.shift, *volume);
} }
} }
//skirts from print //skirts from print
@ -5812,7 +5814,8 @@ void GLCanvas3D::_load_print_toolpaths()
//skirts from objects //skirts from objects
for (const PrintObject* print_object : print->objects()) { for (const PrintObject* print_object : print->objects()) {
if ( !print_object->skirt().empty() && (i != 0 || !print_object->skirt_first_layer())) if ( !print_object->skirt().empty() && (i != 0 || !print_object->skirt_first_layer()))
_3DScene::extrusionentity_to_verts(print_object->skirt(), print_zs[i], Point(0, 0), *volume); for (const PrintInstance& inst : print_object->instances())
_3DScene::extrusionentity_to_verts(print_object->skirt(), print_zs[i], inst.shift, *volume);
} }
// Ensure that no volume grows over the limits. If the volume is too large, allocate a new one. // Ensure that no volume grows over the limits. If the volume is too large, allocate a new one.
if (volume->indexed_vertex_array.vertices_and_normals_interleaved.size() > MAX_VERTEX_BUFFER_SIZE) { if (volume->indexed_vertex_array.vertices_and_normals_interleaved.size() > MAX_VERTEX_BUFFER_SIZE) {