diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 15:31:31 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 15:31:31 +0400 |
| commit | 7b2101ace983cc9d7112dd45a8b264b51657dea9 (patch) | |
| tree | c1d75f2ae3f30fe9de51c1c7332e862064a93193 /source/blender/editors/object/object_bake.c | |
| parent | 787ea5feb4a80babccd86689b066153ac57db91c (diff) | |
| parent | a87c5eb52cd4951b138f518bf12d498bc5e5eb8a (diff) | |
svn merge ^/trunk/blender -r43482:43524
Diffstat (limited to 'source/blender/editors/object/object_bake.c')
| -rw-r--r-- | source/blender/editors/object/object_bake.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index c3c3f91e37d..e7ab823fc99 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -807,10 +807,8 @@ static void apply_tangmat_callback(DerivedMesh *lores_dm, DerivedMesh *hires_dm, ibuf->userflags= IB_RECT_INVALID; } else { - char *rrgb= (char*)ibuf->rect + pixel*4; - rrgb[0]= FTOCHAR(vec[0]); - rrgb[1]= FTOCHAR(vec[1]); - rrgb[2]= FTOCHAR(vec[2]); + unsigned char *rrgb= (unsigned char *)ibuf->rect + pixel*4; + rgb_float_to_uchar(rrgb, vec); rrgb[3]= 255; } } |