Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stokes <kupomail@gmail.com>2013-07-20 02:54:02 +0400
committerDaniel Stokes <kupomail@gmail.com>2013-07-20 02:54:02 +0400
commita07ac7e6449cf3fde937b28580365ca20c415adc (patch)
treef7fe98da2f0efadd957536a5bd0b164735064333 /source/gameengine/Converter/BL_BlenderDataConversion.cpp
parentd336ae8992435a000e5dfe8d6d24a0cf13a5c40a (diff)
BGE fix [#35563] Object colour setting for objects and fonts not using colour management like materials
Diffstat (limited to 'source/gameengine/Converter/BL_BlenderDataConversion.cpp')
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 4890db193eb..99613f8bd99 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -2085,8 +2085,9 @@ static KX_GameObject *gameobject_from_blenderobject(
case OB_FONT:
{
+ bool do_color_management = !(blenderscene->gm.flag & GAME_GLSL_NO_COLOR_MANAGEMENT);
/* font objects have no bounding box */
- gameobj = new KX_FontObject(kxscene,KX_Scene::m_callbacks, rendertools, ob);
+ gameobj = new KX_FontObject(kxscene,KX_Scene::m_callbacks, rendertools, ob, do_color_management);
/* add to the list only the visible fonts */
if ((ob->lay & kxscene->GetBlenderScene()->lay) != 0)