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_envelope_outline_vert.glsl | |
| parent | a7d43eb1c6e1679d4bdf15a9f558f2dbf0fb5b24 (diff) | |
| parent | a4f2ebc78da4e10e65e864a16d2e621c7c79103d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl')
| -rw-r--r-- | source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl b/source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl index a836d7fa9e1..307c7276184 100644 --- a/source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl +++ b/source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl @@ -7,7 +7,7 @@ uniform mat4 ProjectionMatrix; uniform vec2 viewportSize; uniform float lineThickness = 2.0; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec2 pos0; in vec2 pos1; in vec2 pos2; |