juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-17 14:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into enh-update-wxwidgets

Browse Source 
# Conflicts:
#	src/nanosvg/README.txt
#	src/nanosvg/nanosvg.h
#	src/nanosvg/nanosvgrast.h
#	src/slic3r/GUI/BitmapCache.cpp
#	src/slic3r/GUI/BitmapCache.hpp
#	src/slic3r/GUI/ImGuiWrapper.cpp
This commit is contained in:
Ocraftyone
2023-11-19 19:34:50 -05:00
parent 7b1f49f921 70d86af253
commit 53bc949580
467 changed files with 29648 additions and 17847 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/GUI_ObjectTable.cpp
+3 -3
View File
@@ -2813,13 +2813,13 @@ int ObjectTablePanel::init_filaments_and_colors()
}
unsigned int i = 0;
unsigned char rgb[3];
ColorRGB rgb;
while (i < m_filaments_count) {
const std::string& txt_color = global_config->opt_string("filament_colour", i);
if (i < color_count) {
if (Slic3r::GUI::BitmapCache::parse_color(txt_color, rgb))
if (decode_color(txt_color, rgb))
{
m_filaments_colors[i] = wxColour(rgb[0], rgb[1], rgb[2]);
m_filaments_colors[i] = wxColour(rgb.r_uchar(), rgb.g_uchar(), rgb.b_uchar());
}
else
{