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_util.h | |
| 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_util.h')
| -rw-r--r-- | source/blender/alembic/intern/abc_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h index fcc3b19c48b..fae73ec9d11 100644 --- a/source/blender/alembic/intern/abc_util.h +++ b/source/blender/alembic/intern/abc_util.h @@ -167,7 +167,7 @@ typedef enum { } AbcAxisSwapMode; /* Create a rotation matrix for each axis from euler angles. - * Euler angles are swaped to change coordinate system. */ + * Euler angles are swapped to change coordinate system. */ void create_swapped_rotation_matrix( float rot_x_mat[3][3], float rot_y_mat[3][3], float rot_z_mat[3][3], const float euler[3], @@ -197,7 +197,7 @@ public: /* *************************** */ /** - * Utility class whose purpose is to more easily log related informations. An + * Utility class whose purpose is to more easily log related information. An * instance of the SimpleLogger can be created in any context, and will hold a * copy of all the strings passed to its output stream. * |