diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
| commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
| tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /source/blender/alembic/intern/abc_curves.cc | |
| parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
| parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'source/blender/alembic/intern/abc_curves.cc')
| -rw-r--r-- | source/blender/alembic/intern/abc_curves.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/alembic/intern/abc_curves.cc b/source/blender/alembic/intern/abc_curves.cc index e27403305da..f9880eda451 100644 --- a/source/blender/alembic/intern/abc_curves.cc +++ b/source/blender/alembic/intern/abc_curves.cc @@ -153,7 +153,7 @@ void AbcCurveWriter::do_write() if (nurbs->knotsu != NULL) { const size_t num_knots = KNOTSU(nurbs); - /* Add an extra knot at the beggining and end of the array since most apps + /* Add an extra knot at the beginning and end of the array since most apps * require/expect them. */ knots.resize(num_knots + 2); |