diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-21 17:33:07 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-21 17:33:07 +0300 |
| commit | 8986c92b651ddf7ec6b5b71f70a92a3d08b250b5 (patch) | |
| tree | 0324dba633dd689d38927fa6c0f40cd9c7723cbb /source/blender | |
| parent | d518438479fea395970ddf7395d71452cbe1e57b (diff) | |
| parent | 1d38a83139582ff37adc0757bd39d87d5932ddf5 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 32 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 2 |
2 files changed, 18 insertions, 16 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index b352bf7f300..6ef3f980c85 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -1318,11 +1318,11 @@ BLI_INLINE void apply_blend_function_byte( rt = out; while (y--) { for (x = xo; x > 0; x--) { - achannel = rt2[3]; - rt2[3] = (unsigned int) achannel * facf0; + achannel = rt1[3]; + rt1[3] = (unsigned int) achannel * facf0; blend_function(rt, rt1, rt2); - rt2[3] = achannel; - rt[3] = rt2[3]; + rt1[3] = achannel; + rt[3] = rt1[3]; rt1 += 4; rt2 += 4; rt += 4; @@ -1332,11 +1332,11 @@ BLI_INLINE void apply_blend_function_byte( } y--; for (x = xo; x > 0; x--) { - achannel = rt2[3]; - rt2[3] = (unsigned int) achannel * facf1; + achannel = rt1[3]; + rt1[3] = (unsigned int) achannel * facf1; blend_function(rt, rt1, rt2); - rt2[3] = achannel; - rt[3] = rt2[3]; + rt1[3] = achannel; + rt[3] = rt1[3]; rt1 += 4; rt2 += 4; rt += 4; @@ -1357,11 +1357,11 @@ BLI_INLINE void apply_blend_function_float( rt = out; while (y--) { for (x = xo; x > 0; x--) { - achannel = rt2[3]; - rt2[3] = achannel * facf0; + achannel = rt1[3]; + rt1[3] = achannel * facf0; blend_function(rt, rt1, rt2); - rt2[3] = achannel; - rt[3] = rt2[3]; + rt1[3] = achannel; + rt[3] = rt1[3]; rt1 += 4; rt2 += 4; rt += 4; @@ -1371,11 +1371,11 @@ BLI_INLINE void apply_blend_function_float( } y--; for (x = xo; x > 0; x--) { - achannel = rt2[3]; - rt2[3] = achannel * facf1; + achannel = rt1[3]; + rt1[3] = achannel * facf1; blend_function(rt, rt1, rt2); - rt2[3] = achannel; - rt[3] = rt2[3]; + rt1[3] = achannel; + rt[3] = rt1[3]; rt1 += 4; rt2 += 4; rt += 4; diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index dea823a9675..59697e7ea30 100644 --- 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); |