[Bf-blender-cvs] [82f01c666f2] blender2.8: View3D: Grid: Don't make the Zaxis produce any fragment is not needed
Clément Foucault
noreply at git.blender.org
Mon Dec 3 17:19:19 CET 2018
Commit: 82f01c666f24e52b09be159c764131c19a9d4d75
Author: Clément Foucault
Date: Mon Dec 3 00:38:29 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB82f01c666f24e52b09be159c764131c19a9d4d75
View3D: Grid: Don't make the Zaxis produce any fragment is not needed
This was a bug that was making the grid drawing even more slower than it
is.
===================================================================
M source/blender/draw/modes/shaders/object_grid_vert.glsl
===================================================================
diff --git a/source/blender/draw/modes/shaders/object_grid_vert.glsl b/source/blender/draw/modes/shaders/object_grid_vert.glsl
index a346973a597..15b37bb289d 100644
--- a/source/blender/draw/modes/shaders/object_grid_vert.glsl
+++ b/source/blender/draw/modes/shaders/object_grid_vert.glsl
@@ -53,10 +53,10 @@ void main()
/* Used for additional Z axis */
if ((gridFlag & CLIP_Z_POS) != 0) {
- realPos.z = max(realPos.z, 0.0);
+ realPos.z = clamp(realPos.z, 0.0, 1e30);
}
if ((gridFlag & CLIP_Z_NEG) != 0) {
- realPos.z = min(-realPos.z, 0.0);
+ realPos.z = clamp(realPos.z, -1e30, 0.0);
}
gl_Position = ViewProjectionMatrix * vec4(realPos, 1.0);
More information about the Bf-blender-cvs
mailing list