diff options
author | Bastien Montagne <bastien@blender.org> | 2020-08-04 14:36:58 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-08-04 14:36:58 +0300 |
commit | 5f621a12c6d14d6ec0439992bc0c2590a2bd4760 (patch) | |
tree | 7143836d4095c1260f4afee06132ffd72ccabcaa /source/blender/draw/engines | |
parent | ca606bf55165881896467f6a5c09e5870c847fbb (diff) | |
parent | 701a9d39175e0d3e5e2f776821f1251b8a7a5f78 (diff) |
Merge branch 'blender-v2.90-release'
Conflicts:
source/blender/editors/gpencil/gpencil_primitive.c
Diffstat (limited to 'source/blender/draw/engines')
-rw-r--r-- | source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl index 36fe9df9e5a..c19bf1e7b50 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl @@ -487,7 +487,7 @@ void stroke_vertex() vec2 screen_ofs = miter * y; - /* Reminder: we packed the cap flag into the sign of stength and thickness sign. */ + /* Reminder: we packed the cap flag into the sign of strength and thickness sign. */ if ((is_stroke_start && strength1 > 0.0) || (is_stroke_end && thickness1 > 0.0) || (miter_break && !is_stroke_start && !is_stroke_end)) { screen_ofs += line * x; |