diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 12:22:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 12:22:23 +0400 |
| commit | 4786541285f6f190922ec9857753d620c528f181 (patch) | |
| tree | 4eb00a6e2fe307d1147e7cb1d0a6785915c0432f /source/blender/render/intern | |
| parent | 65fca39f77981db5a649d942f308fa457d18cb41 (diff) | |
add utility functions linearrgb_to_srgb_uchar4,
linearrgb_to_srgb_uchar3, was being done inline.
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 630acf3d88a..c5d580b2e9f 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -2166,17 +2166,10 @@ static void bake_shade(void *handle, Object *ob, ShadeInput *shi, int UNUSED(qua } } else { - char *col= (char *)(bs->rect + bs->rectx*y + x); + unsigned char *col= (unsigned char *)(bs->rect + bs->rectx*y + x); if (ELEM(bs->type, RE_BAKE_ALL, RE_BAKE_TEXTURE) && (R.r.color_mgt_flag & R_COLOR_MANAGEMENT)) { - float srgb[3]; - srgb[0]= linearrgb_to_srgb(shr.combined[0]); - srgb[1]= linearrgb_to_srgb(shr.combined[1]); - srgb[2]= linearrgb_to_srgb(shr.combined[2]); - - col[0]= FTOCHAR(srgb[0]); - col[1]= FTOCHAR(srgb[1]); - col[2]= FTOCHAR(srgb[2]); + linearrgb_to_srgb_uchar3(col, shr.combined); } else { col[0]= FTOCHAR(shr.combined[0]); col[1]= FTOCHAR(shr.combined[1]); |