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/intern | |
| 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/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_gpencil.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c index d648245f232..e8355c1d8da 100644 --- a/source/blender/draw/intern/draw_cache_impl_gpencil.c +++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c @@ -272,7 +272,7 @@ static void gpencil_buffer_add_point(gpStrokeVert *verts, int v, bool is_endpoint) { - /* Note: we use the sign of stength and thickness to pass cap flag. */ + /* Note: we use the sign of strength and thickness to pass cap flag. */ const bool round_cap0 = (gps->caps[0] == GP_STROKE_CAP_ROUND); const bool round_cap1 = (gps->caps[1] == GP_STROKE_CAP_ROUND); gpStrokeVert *vert = &verts[v]; |