diff options
author | Marius Kintel <marius@kintel.net> | 2011-12-25 23:38:03 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-12-25 23:38:03 (GMT) |
commit | c4bffdaf37fdf72a84a225ec584d3698fe398857 (patch) | |
tree | 503b819d69c00f007709cfee0f332c7adc7ad818 /src/renderer.cc | |
parent | 3e64e63b0113a99666ad68aa3e82bb7b80324d9b (diff) |
Color overriding now works. The outermost color will win if multiple colors are specified for the same object
Diffstat (limited to 'src/renderer.cc')
-rw-r--r-- | src/renderer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/renderer.cc b/src/renderer.cc index b791673..5a767b8 100644 --- a/src/renderer.cc +++ b/src/renderer.cc @@ -2,7 +2,7 @@ #include "rendersettings.h" #include <QColor> -void Renderer::setColor(const double color[4], GLint *shaderinfo) const +void Renderer::setColor(const float color[4], GLint *shaderinfo) const { QColor col = RenderSettings::inst()->color(RenderSettings::OPENCSG_FACE_FRONT_COLOR); double c[4] = {color[0], color[1], color[2], color[3]}; |