forked from bartvdbraak/blender
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.
This commit is contained in:
parent
409a6ee57b
commit
49e0c832e1
@ -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_to != IB_PROFILE_NONE);
|
||||||
BLI_assert(profile_from != IB_PROFILE_NONE);
|
BLI_assert(profile_from != IB_PROFILE_NONE);
|
||||||
|
|
||||||
BLI_init_srgb_conversion();
|
|
||||||
if (dither)
|
if (dither)
|
||||||
di = create_dither_context(width, 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_to != IB_PROFILE_NONE);
|
||||||
BLI_assert(profile_from != IB_PROFILE_NONE);
|
BLI_assert(profile_from != IB_PROFILE_NONE);
|
||||||
|
|
||||||
BLI_init_srgb_conversion();
|
|
||||||
|
|
||||||
/* RGBA input */
|
/* RGBA input */
|
||||||
for (y = 0; y < height; y++) {
|
for (y = 0; y < height; y++) {
|
||||||
const uchar *from = rect_from + stride_from * y * 4;
|
const uchar *from = rect_from + stride_from * y * 4;
|
||||||
|
@ -66,6 +66,7 @@
|
|||||||
#include "BKE_tracking.h" /* free tracking clipboard */
|
#include "BKE_tracking.h" /* free tracking clipboard */
|
||||||
|
|
||||||
#include "BLI_listbase.h"
|
#include "BLI_listbase.h"
|
||||||
|
#include "BLI_math_color.h"
|
||||||
#include "BLI_string.h"
|
#include "BLI_string.h"
|
||||||
#include "BLI_utildefines.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_init(11, U.dpi); /* Please update source/gamengine/GamePlayer/GPG_ghost.cpp if you change this */
|
||||||
BLF_lang_init();
|
BLF_lang_init();
|
||||||
|
|
||||||
|
/* initialize color stuff */
|
||||||
|
BLI_init_srgb_conversion();
|
||||||
|
|
||||||
/* get the default database, plus a wm */
|
/* get the default database, plus a wm */
|
||||||
WM_read_homefile(C, NULL, G.factory_startup);
|
WM_read_homefile(C, NULL, G.factory_startup);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user