3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
YuSanka 2019-10-09 11:34:57 +02:00
commit 09a7b348f4
46 changed files with 2030 additions and 1030 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/wxExtensions.cpp
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];