diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-04 22:29:08 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-04 22:29:08 (GMT) |
| commit | 52dfffd97ba49b603b4814d843cd9be08d040364 (patch) | |
| tree | 044c93d19aa38ac24822a241babbece7425bfbb2 /src/renderer.cc | |
| parent | 0be212e75d73644b1cff8291a4b6a6fe0098b942 (diff) | |
| parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) | |
Merge branch 'master' into threading
Conflicts:
RELEASE_NOTES
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]}; |