Merge branch 'blender2.7'

2019-02-21 15:33:07 +01:00
parent d518438479 1d38a83139
commit 8986c92b65
5 changed files with 155 additions and 165 deletions
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2086,6 +2086,8 @@ bool RE_WriteRenderViewsImage(ReportList *reports, RenderResult *rr, Scene *scen

 					ImBuf *ibuf = render_result_rect_to_ibuf(rr, rd, view_id);
 					ibuf->planes = 24;
+					IMB_colormanagement_imbuf_for_write(ibuf, true, false, &scene->view_settings,
+					                                    &scene->display_settings, &imf);

 					ok = render_imbuf_write_stamp_test(reports, scene, rr, ibuf, name, &imf, stamp);