kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Move sRGB conversion initialization to init_exit routines

Browse Source 
It was a threading issue in color management project which potentially
could happen in trunk as well.
This commit is contained in:
Sergey Sharybin 2012-07-27 14:53:57 +00:00
parent 409a6ee57b
commit 49e0c832e1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/imbuf/intern/divers.c
View File

@ -199,7 +199,6 @@ void IMB_buffer_byte_from_float(uchar *rect_to, const float *rect_from,
BLI_assert(profile_to != IB_PROFILE_NONE);
BLI_assert(profile_from != IB_PROFILE_NONE);
BLI_init_srgb_conversion();
if (dither)
di = create_dither_context(width, dither);
@ -335,8 +334,6 @@ void IMB_buffer_float_from_byte(float *rect_to, const uchar *rect_from,
BLI_assert(profile_to != IB_PROFILE_NONE);
BLI_assert(profile_from != IB_PROFILE_NONE);
BLI_init_srgb_conversion();
/* RGBA input */
for (y = 0; y < height; y++) {
const uchar *from = rect_from + stride_from * y * 4;

5
source/blender/windowmanager/intern/wm_init_exit.c
View File

@ -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);