diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-19 19:19:49 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-19 19:20:50 +0300 |
| commit | 6b433f4eb3da0acf092fb4e5417b10f9b304d073 (patch) | |
| tree | 17d66beede9df8d8b43f9db39265649c2d72e732 /source/blender/draw/modes/shaders/armature_stick_vert.glsl | |
| parent | a7d43eb1c6e1679d4bdf15a9f558f2dbf0fb5b24 (diff) | |
| parent | a4f2ebc78da4e10e65e864a16d2e621c7c79103d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw/modes/shaders/armature_stick_vert.glsl')
| -rw-r--r-- | source/blender/draw/modes/shaders/armature_stick_vert.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/modes/shaders/armature_stick_vert.glsl b/source/blender/draw/modes/shaders/armature_stick_vert.glsl index 1dbc8e161c2..3b6bb640b63 100644 --- a/source/blender/draw/modes/shaders/armature_stick_vert.glsl +++ b/source/blender/draw/modes/shaders/armature_stick_vert.glsl @@ -4,7 +4,7 @@ uniform mat4 ViewProjectionMatrix; uniform mat4 ViewMatrix; uniform vec2 viewportSize; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec2 pos; /* bone aligned screen space */ in uint flag; @@ -33,7 +33,7 @@ noperspective out float colorFac; flat out vec4 finalWireColor; flat out vec4 finalInnerColor; -uniform float stickSize = 5.0; /* might be dependant on DPI setting in the future. */ +uniform float stickSize = 5.0; /* might be dependent on DPI setting in the future. */ /* project to screen space */ vec2 proj(vec4 pos) |