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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Filip Sykala 2022-04-06 12:42:00 +02:00
commit 5004897c2d
5 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/profiles/Artillery/bed-x1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 MiB

After

Width:  |  Height:  |  Size: 67 KiB

BIN
resources/profiles/RatRig/rr-vc-300.stl
View File

Binary file not shown.

BIN
resources/profiles/RatRig/rr-vc-400.stl
View File

Binary file not shown.

BIN
resources/profiles/RatRig/rr-vc-500.stl
View File

Binary file not shown.

2
src/slic3r/GUI/GLModel.cpp
View File

@ -198,7 +198,6 @@ Vec2f GLModel::Geometry::extract_tex_coord_2(size_t id) const
return { *(start + 0), *(start + 1) };
}
#if ENABLE_LEGACY_OPENGL_REMOVAL
void GLModel::Geometry::set_vertex(size_t id, const Vec3f& position, const Vec3f& normal)
{
assert(format.vertex_layout == EVertexLayout::P3N3);
@ -240,7 +239,6 @@ void GLModel::Geometry::remove_vertex(size_t id)
vertices.erase(it, it + stride);
}
}
#endif // ENABLE_LEGACY_OPENGL_REMOVAL
size_t GLModel::Geometry::vertex_stride_floats(const Format& format)
{