diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/gameengine/GamePlayer/ghost/SConscript | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_FontObject.cpp | 17 |
2 files changed, 6 insertions, 13 deletions
diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript index b507e2bda7b..7420218ffbb 100644 --- a/source/gameengine/GamePlayer/ghost/SConscript +++ b/source/gameengine/GamePlayer/ghost/SConscript @@ -43,7 +43,7 @@ incs = [ '#intern/guardedalloc', '#intern/moto/include', '#intern/container', - '#intern/audaspace/intern', + '#intern/audaspace/intern', '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', '#source/gameengine/BlenderRoutines', '#source/gameengine/Converter', diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp index 63f715779f3..c6d1041a12a 100644 --- a/source/gameengine/Ketsji/KX_FontObject.cpp +++ b/source/gameengine/Ketsji/KX_FontObject.cpp @@ -178,19 +178,12 @@ void KX_FontObject::DrawText() /* Font Objects don't use the glsl shader, this color management code is copied from gpu_shader_material.glsl */ float color[4]; - for (int i = 0; i < 3; i++) { - if (m_do_color_management) { - float c = m_color[i]; - if(c < 0.0031308) - c = (c < 0.0) ? 0.0: c * 12.92; - else - c = 1.055 * pow(c, 1.0f/2.4f) - 0.055; - color[i] = c; - } - else - color[i] = m_color[i]; + if (m_do_color_management) { + linearrgb_to_srgb_v4(color, m_color); + } + else { + copy_v4_v4(color, m_color); } - color[3] = m_color[3]; /* HARDCODED MULTIPLICATION FACTOR - this will affect the render resolution directly */ const float RES = BGE_FONT_RES * m_resolution; |