Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators

This commit is contained in:
Enrico Turri 2018-04-10 11:46:51 +02:00
commit e92cf311db

View file

@ -545,7 +545,7 @@ unsigned get_colour_approx_luma(const wxColour &colour)
double g = colour.Green();
double b = colour.Blue();
std::round(std::sqrt(
return std::round(std::sqrt(
r * r * .241 +
g * g * .691 +
b * b * .068