diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2015-07-06 17:51:40 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2015-07-06 17:51:40 +0300 |
commit | 93608e4f3bba2c24f46376177fdc1d4fdef98884 (patch) | |
tree | ea781c29d825ee077a682903d574b7762d3811ed | |
parent | 6a132aa65d45658262a634620e756b3fd6c2ddb6 (diff) |
Fix T45237: Dither does not work
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 97e516baf7a..482db9d6eaf 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -3690,18 +3690,20 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **r_loc } if (rpass) { - channels = rpass->channels; rectf = rpass->rect; - - if (!rectf) { - /* Happens when Save Buffers is enabled. - * Use display buffer stored in the render layer. - */ - rect = (unsigned int *) rl->display_buffer; - byte_buffer_in_display_space = true; + if (passtype == SCE_PASS_COMBINED) { + if (rectf == NULL) { + /* Happens when Save Buffers is enabled. + * Use display buffer stored in the render layer. + */ + rect = (unsigned int *) rl->display_buffer; + byte_buffer_in_display_space = true; + } + } + else { + channels = rpass->channels; + dither = 0.0f; /* don't dither passes */ } - - dither = 0.0f; /* don't dither passes */ } for (rpass = rl->passes.first; rpass; rpass = rpass->next) |