diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-30 17:16:55 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-30 17:16:55 +0400 |
commit | e91f33101ff0999e07f7ce941f31dca793d954e7 (patch) | |
tree | 83c0d933f2ac1d063e2c57aaded58fd09d8d5712 /source/blender/editors/render | |
parent | a42ba82f638e481d7fd3c3ed2ba05c331ef6717e (diff) | |
parent | 818b2e81da7d5f3e04439e3b4fef5c7ce5263b5b (diff) |
Merged changes in the trunk up to revision 50956.
Conflicts resolved:
source/blender/editors/interface/resources.c
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index d9618e89b68..85ae923f881 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -547,11 +547,11 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op) if (ibuf) { int needs_free = FALSE; - if (is_movie || !BKE_imtype_supports_float(scene->r.im_format.imtype)) { - ImBuf *colormanage_ibuf = IMB_dupImBuf(ibuf); + if (is_movie || !BKE_imtype_requires_linear_float(scene->r.im_format.imtype)) { + ImBuf *colormanage_ibuf; - IMB_display_buffer_to_imbuf_rect(colormanage_ibuf, &scene->view_settings, &scene->display_settings); - imb_freerectfloatImBuf(colormanage_ibuf); + colormanage_ibuf = IMB_colormanagement_imbuf_for_write(ibuf, TRUE, TRUE, &scene->view_settings, + &scene->display_settings, &scene->r.im_format); // IMB_freeImBuf(ibuf); /* owned by the image */ ibuf = colormanage_ibuf; |