Commit: 93608e4f3bba2c24f46376177fdc1d4fdef98884
Author: Dalai Felinto
Date: Mon Jul 6 11:51:40 2015 -0300
Branches: master
https://developer.blender.org/rB93608e4f3bba2c24f46376177fdc1d4fdef98884
Fix T45237: Dither does not work
===================================================================
M source/blender/blenkernel/intern/image.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 97e516b..482db9d 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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
