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/blenlib | |
| 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/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 937bf8b1ae6..7c187679ad1 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -3000,7 +3000,7 @@ int isect_line_line_epsilon_v3(const float v1[3], mul_v3_fl(a, dot_v3v3(cb, ab) / dot_v3v3(ab, ab)); add_v3_v3v3(r_i1, v1, a); - /* for the second line, just substract the offset from the first intersection point */ + /* for the second line, just subtract the offset from the first intersection point */ sub_v3_v3v3(r_i2, r_i1, t); return 2; /* two nearest points */ |