[Bf-blender-cvs] [a951aa5f620] master: Fix T64296 Z-axis overlay vanishes at scene origin in 3D Viewport

Clément Foucault noreply at git.blender.org
Thu May 9 10:59:32 CEST 2019


Commit: a951aa5f6203e87e9a7770068f74670fce866814
Author: Clément Foucault
Date:   Thu May 9 10:59:25 2019 +0200
Branches: master
https://developer.blender.org/rBa951aa5f6203e87e9a7770068f74670fce866814

Fix T64296 Z-axis overlay vanishes at scene origin in 3D Viewport

Grid shader was still using deprecated eye vector.

===================================================================

M	source/blender/draw/modes/shaders/object_grid_frag.glsl

===================================================================

diff --git a/source/blender/draw/modes/shaders/object_grid_frag.glsl b/source/blender/draw/modes/shaders/object_grid_frag.glsl
index df2cfe7be82..f4056f3a06c 100644
--- a/source/blender/draw/modes/shaders/object_grid_frag.glsl
+++ b/source/blender/draw/modes/shaders/object_grid_frag.glsl
@@ -9,9 +9,9 @@ in vec3 local_pos;
 out vec4 FragColor;
 
 uniform mat4 ProjectionMatrix;
+uniform mat4 ViewMatrixInverse;
 uniform vec3 cameraPos;
 uniform vec3 planeAxes;
-uniform vec3 eye;
 uniform vec4 gridSettings;
 uniform float meshSize;
 uniform float lineKernel = 0.0;
@@ -109,7 +109,7 @@ void main()
     dist = 1.0; /* avoid branch after */
 
     if ((gridFlag & PLANE_XY) != 0) {
-      float angle = 1.0 - abs(eye.z);
+      float angle = 1.0 - abs(ViewMatrixInverse[2].z);
       dist = 1.0 + angle * 2.0;
       angle *= angle;
       fade *= 1.0 - angle * angle;



More information about the Bf-blender-cvs mailing list