diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-13 02:18:20 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-13 02:18:20 +0400 |
commit | 866f986898cf6c35e8b4d5190853e453a3eb1714 (patch) | |
tree | 35ea0e3113cace07b2636b2821516551f9506091 /source/blender/blenkernel | |
parent | cfb160c764b2bc65755b73ca42a60f7a5572e4f3 (diff) |
fix for stamp text drawing into a color buffer not taking color management into account.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image_gen.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 1adf2c891e3..4bd47f391af 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1491,7 +1491,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec /* set before return */ BLF_size(mono, scene->r.stamp_font_id, 72); - BLF_buffer(mono, rectf, rect, width, height, channels); + BLF_buffer(mono, rectf, rect, width, height, channels, (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) != 0); BLF_buffer_col(mono, scene->r.fg_stamp[0], scene->r.fg_stamp[1], scene->r.fg_stamp[2], 1.0); pad = BLF_width_max(mono); @@ -1668,7 +1668,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec } /* cleanup the buffer. */ - BLF_buffer(mono, NULL, NULL, 0, 0, 0); + BLF_buffer(mono, NULL, NULL, 0, 0, 0, FALSE); #undef BUFF_MARGIN_X #undef BUFF_MARGIN_Y diff --git a/source/blender/blenkernel/intern/image_gen.c b/source/blender/blenkernel/intern/image_gen.c index d460368784a..4d7013b9f73 100644 --- a/source/blender/blenkernel/intern/image_gen.c +++ b/source/blender/blenkernel/intern/image_gen.c @@ -289,7 +289,7 @@ static void checker_board_text(unsigned char *rect, float *rect_float, int width BLF_size(mono, 54, 72); /* hard coded size! */ - BLF_buffer(mono, rect_float, rect, width, height, 4); + BLF_buffer(mono, rect_float, rect, width, height, 4, TRUE); for (y = 0; y < height; y += step) { text[1] = '1'; @@ -330,7 +330,7 @@ static void checker_board_text(unsigned char *rect, float *rect_float, int width } /* cleanup the buffer. */ - BLF_buffer(mono, NULL, NULL, 0, 0, 0); + BLF_buffer(mono, NULL, NULL, 0, 0, 0, FALSE); } void BKE_image_buf_fill_checker_color(unsigned char *rect, float *rect_float, int width, int height) |