diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-07-27 18:53:57 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-07-27 18:53:57 +0400 |
| commit | 49e0c832e16195d8a656798830a63074eb6cd6c7 (patch) | |
| tree | c9bf9e53287be88bc2efc7beeebdd92a4745d6db /source/blender/windowmanager | |
| parent | 409a6ee57b66b610f8d05a777f54ffc20b701a0f (diff) | |
Move sRGB conversion initialization to init_exit routines
It was a threading issue in color management project which potentially
could happen in trunk as well.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 91942a232e1..6297c337335 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -66,6 +66,7 @@ #include "BKE_tracking.h" /* free tracking clipboard */ #include "BLI_listbase.h" +#include "BLI_math_color.h" #include "BLI_string.h" #include "BLI_utildefines.h" @@ -145,6 +146,10 @@ void WM_init(bContext *C, int argc, const char **argv) BLF_init(11, U.dpi); /* Please update source/gamengine/GamePlayer/GPG_ghost.cpp if you change this */ BLF_lang_init(); + + /* initialize color stuff */ + BLI_init_srgb_conversion(); + /* get the default database, plus a wm */ WM_read_homefile(C, NULL, G.factory_startup); |