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

Merge remote-tracking branch 'origin/scene_manipulators'

Browse source
This commit is contained in:
bubnikv 2018-04-13 16:54:22 +02:00
commit 913cdef297
12 changed files with 238 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xs/src/slic3r/GUI/PresetBundle.cpp
View file

@ -990,7 +990,7 @@ static inline int hex_digit_to_int(const char c)
(c >= 'a' && c <= 'f') ? int(c - 'a') + 10 : -1;
}
static inline bool parse_color(const std::string &scolor, unsigned char *rgb_out)
bool PresetBundle::parse_color(const std::string &scolor, unsigned char *rgb_out)
{
rgb_out[0] = rgb_out[1] = rgb_out[2] = 0;
if (scolor.size() != 7 || scolor.front() != '#')