1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-11 08:04:25 +00:00

Merge remote-tracking branch 'origin/master' into ys_color_print_extension

This commit is contained in:
YuSanka
2019-10-09 11:34:57 +02:00
46 changed files with 2030 additions and 1030 deletions
+1 -1
View File
@@ -455,7 +455,7 @@ Slic3r::GUI::BitmapCache* m_bitmap_cache = nullptr;
std::vector<wxBitmap*> bmps;
std::vector<std::string> colors = Slic3r::GUI::wxGetApp().plater()->get_extruder_colors_from_plater_config();
if (bmps.empty())
if (colors.empty())
return bmps;
unsigned char rgb[3];