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

Fixed build on Win and one more warning

Browse source
This commit is contained in:
Lukas Matena 2021-09-15 18:39:55 +02:00
parent 71ba15b6f0
commit aef90bc735
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/GLToolbar.cpp
View file

@ -1175,9 +1175,6 @@ void GLToolbar::render_arrow(const GLCanvas3D& parent, GLToolbarItem* highlighte
float right = left + scaled_icons_size; float right = left + scaled_icons_size;
unsigned int tex_id = m_arrow_texture.texture.get_id(); unsigned int tex_id = m_arrow_texture.texture.get_id();
// width and height of icon arrow is pointing to
float tex_width = (float)m_icons_texture.get_width();
float tex_height = (float)m_icons_texture.get_height();
// arrow width and height // arrow width and height
float arr_tex_width = (float)m_arrow_texture.texture.get_width(); float arr_tex_width = (float)m_arrow_texture.texture.get_width();
float arr_tex_height = (float)m_arrow_texture.texture.get_height(); float arr_tex_height = (float)m_arrow_texture.texture.get_height();

2
src/slic3r/GUI/Plater.cpp
View file

@ -3691,7 +3691,7 @@ void Plater::priv::create_simplify_notification(const std::vector<size_t>& obj_i
std::vector<size_t> big_ids; std::vector<size_t> big_ids;
big_ids.reserve(obj_ids.size()); big_ids.reserve(obj_ids.size());
std::copy_if(obj_ids.begin(), obj_ids.end(), std::back_inserter(big_ids), std::copy_if(obj_ids.begin(), obj_ids.end(), std::back_inserter(big_ids),
[this](size_t object_id) { [this, triangles_to_suggest_simplify](size_t object_id) {
if (object_id >= model.objects.size()) return false; // out of object index if (object_id >= model.objects.size()) return false; // out of object index
ModelVolumePtrs& volumes = model.objects[object_id]->volumes; ModelVolumePtrs& volumes = model.objects[object_id]->volumes;
if (volumes.size() != 1) return false; // not only one volume if (volumes.size() != 1) return false; // not only one volume