GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 21:57:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Filip Sykala 2022-04-05 13:08:01 +02:00
parent c88d9452c0
commit a5ae6394a5
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libslic3r/Format/3mf.cpp
View File

@ -3120,9 +3120,6 @@ namespace Slic3r {
} }
stream << "\"/>\n"; stream << "\"/>\n";
if (volume->text_configuration.has_value()) {
int j = 42;
}
// stores volume's source data // stores volume's source data
{ {
std::string input_file = xml_escape(m_fullpath_sources ? volume->source.input_file : boost::filesystem::path(volume->source.input_file).filename().string()); std::string input_file = xml_escape(m_fullpath_sources ? volume->source.input_file : boost::filesystem::path(volume->source.input_file).filename().string());

8
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@ -777,7 +777,6 @@ bool GLGizmoEmboss::process()
assert(font.has_value()); assert(font.has_value());
if (!font.has_value()) return false; if (!font.has_value()) return false;
auto &worker = wxGetApp().plater()->get_ui_job_worker();
// Can't use cancel, because I want cancel only previous EmbossUpdateJob // Can't use cancel, because I want cancel only previous EmbossUpdateJob
// worker.cancel(); // worker.cancel();
@ -788,7 +787,8 @@ bool GLGizmoEmboss::process()
m_update_job_cancel = std::make_shared<std::atomic<bool> >(false); m_update_job_cancel = std::make_shared<std::atomic<bool> >(false);
EmbossDataUpdate data{font, create_configuration(), create_volume_name(), EmbossDataUpdate data{font, create_configuration(), create_volume_name(),
m_volume->id(), m_update_job_cancel}; m_volume->id(), m_update_job_cancel};
/* //*
auto &worker = wxGetApp().plater()->get_ui_job_worker();
queue_job(worker, std::make_unique<EmbossUpdateJob>(std::move(data))); queue_job(worker, std::make_unique<EmbossUpdateJob>(std::move(data)));
/*/ /*/
// Run Job on main thread (blocking) // Run Job on main thread (blocking)
@ -2246,8 +2246,8 @@ void GLGizmoEmboss::init_icons()
filenames, states, m_gui_cfg->icon_width, compress); filenames, states, m_gui_cfg->icon_width, compress);
if (!is_loaded || if (!is_loaded ||
m_icons_texture.get_width() < states.size() * m_gui_cfg->icon_width || m_icons_texture.get_width() < ((int)states.size() * m_gui_cfg->icon_width) ||
m_icons_texture.get_height() < filenames.size() * m_gui_cfg->icon_width) { m_icons_texture.get_height() < ((int)filenames.size() * m_gui_cfg->icon_width)) {
// bad load of icons, but all usage of m_icons_texture check that texture is initialized // bad load of icons, but all usage of m_icons_texture check that texture is initialized
assert(false); assert(false);
m_icons_texture.reset(); m_icons_texture.reset();