diff options
| author | mano-wii <germano.costa@ig.com.br> | 2019-08-19 17:49:07 +0300 |
|---|---|---|
| committer | mano-wii <germano.costa@ig.com.br> | 2019-08-19 18:05:57 +0300 |
| commit | 4bf37bafc2701afc8d8f7482c1ebbdd5f9db8e3f (patch) | |
| tree | c064dc64162dbffb06362d6f698b176956671497 /source/blender/draw/modes/shaders/object_grid_vert.glsl | |
| parent | 3cbf2462391c4adecd5be0bcd3e9654d494d9ed2 (diff) | |
View3D Grid: fix imperial grid drawing
This is a step to finish the D4325 and fix the T61286.
Currently the grid is highlighted in steps of 10 out of 10, which is wrong for the imperial units as seen in `buImperialLenDef`.
The idea of the code is to pass the steps of the grid already dimensioned as a uniform.
Another important thing to note is that subdivisions now only affect the grid without unity.
This matches the 2.7x Blender versions.
No performance loss (almost no gain too).
Reviewers: fclem
Subscribers: zlsa, rl.amorato
Differential Revision: https://developer.blender.org/D4379
Diffstat (limited to 'source/blender/draw/modes/shaders/object_grid_vert.glsl')
| -rw-r--r-- | source/blender/draw/modes/shaders/object_grid_vert.glsl | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/draw/modes/shaders/object_grid_vert.glsl b/source/blender/draw/modes/shaders/object_grid_vert.glsl index d247967b03a..496bb011c74 100644 --- a/source/blender/draw/modes/shaders/object_grid_vert.glsl +++ b/source/blender/draw/modes/shaders/object_grid_vert.glsl @@ -3,14 +3,8 @@ * Clément Foucault */ uniform vec3 planeAxes; -uniform vec4 gridSettings; uniform float meshSize; -#define gridDistance gridSettings.x -#define gridResolution gridSettings.y -#define gridScale gridSettings.z -#define gridSubdiv gridSettings.w - uniform int gridFlag; #define cameraPos (ViewMatrixInverse[3].xyz) |