3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-24 00:28:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge 2f58eface9 into 506fde8f86

Browse source
This commit is contained in:
Dipl.-Ing. Raoul Rubien, BSc 2025-12-23 16:57:21 -05:00 • committed by GitHub
commit 2e1d5624dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/OrcaSlicer.cpp
View file

@ -1791,7 +1791,7 @@ int CLI::run(int argc, char **argv)
}
}
catch (std::exception& e) {
boost::nowide::cerr << construct_assemble_list << ": " << e.what() << std::endl;
boost::nowide::cerr << "construct_assemble_list: " << e.what() << std::endl;
record_exit_reson(outfile_dir, CLI_DATA_FILE_ERROR, 0, cli_errors[CLI_DATA_FILE_ERROR], sliced_info);
flush_and_exit(CLI_DATA_FILE_ERROR);
}

12
src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp
View file

@ -1126,8 +1126,8 @@ TriangleSelector::ClippingPlane GLGizmoPainterBase::get_clipping_plane_in_volume
return TriangleSelector::ClippingPlane({float(normal_transformed.x()), float(normal_transformed.y()), float(normal_transformed.z()), offset_transformed});
}
ColorRGBA TriangleSelectorGUI::enforcers_color = {0.5f, 1.f, 0.5f, 1.f};
ColorRGBA TriangleSelectorGUI::blockers_color = {1.f, 0.5f, 0.5f, 1.f};
const ColorRGBA TriangleSelectorGUI::enforcers_color = {0.5f, 1.f, 0.5f, 1.f};
const ColorRGBA TriangleSelectorGUI::blockers_color = {1.f, 0.5f, 0.5f, 1.f};
ColorRGBA TriangleSelectorGUI::get_seed_fill_color(const ColorRGBA& base_color)
{
@ -1151,10 +1151,10 @@ void TriangleSelectorGUI::render(ImGuiWrapper* imgui, const Transform3d& matrix)
return;
assert(shader->get_name() == "gouraud" || shader->get_name() == "mm_gouraud");
for (auto iva : {std::make_pair(&m_iva_enforcers, enforcers_color),
std::make_pair(&m_iva_blockers, blockers_color)}) {
iva.first->set_color(iva.second);
iva.first->render();
for (auto iva : {std::make_pair<GLModel &, const ColorRGBA &>(m_iva_enforcers, enforcers_color),
std::make_pair(m_iva_blockers, blockers_color)}) {
iva.first.set_color(iva.second);
iva.first.render();
}
for (auto& iva : m_iva_seed_fills) {

4
src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
View file

@ -49,8 +49,8 @@ public:
}
// BBS
static ColorRGBA enforcers_color;
static ColorRGBA blockers_color;
static const ColorRGBA enforcers_color;
static const ColorRGBA blockers_color;
#ifdef PRUSASLICER_TRIANGLE_SELECTOR_DEBUG
void render_debug(ImGuiWrapper* imgui);