Commit: fe40e184a697c1235a696356b24e8c45dc06185a
Author: Clément Foucault
Date: Fri Mar 15 22:14:42 2019 +0100
Branches: master
https://developer.blender.org/rBfe40e184a697c1235a696356b24e8c45dc06185a
Fix T61857 Eevee DOF not working if the camera is in orthographic mode
It was just a bad mapping of the ogl depth to scene linear depth.
===================================================================
M source/blender/draw/engines/eevee/shaders/effect_dof_frag.glsl
===================================================================
diff --git a/source/blender/draw/engines/eevee/shaders/effect_dof_frag.glsl
b/source/blender/draw/engines/eevee/shaders/effect_dof_frag.glsl
index 067b0786e34..6aa771bcbd5 100644
--- a/source/blender/draw/engines/eevee/shaders/effect_dof_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/effect_dof_frag.glsl
@@ -29,7 +29,7 @@ uniform vec2 nearFar; /* Near & far view depths values */
#define linear_depth(z) ((ProjectionMatrix[3][3] == 0.0) \
? (nearFar.x * nearFar.y) / (z * (nearFar.x - nearFar.y) +
nearFar.y) \
- : (z * 2.0 - 1.0) * nearFar.y)
+ : z * (nearFar.y - nearFar.x) + nearFar.x) /* Only true for
camera view! */
#define weighted_sum(a, b, c, d, e) (a * e.x + b * e.y + c * e.z + d * e.w) /
max(1e-6, dot(e, vec4(1.0)));
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
