mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Merge remote-tracking branch 'origin/master' into ys_color_print_extension
This commit is contained in:
commit
09a7b348f4
46 changed files with 2030 additions and 1030 deletions
|
@ -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];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue