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/python/mathutils/mathutils.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/python/mathutils/mathutils.h')
-rw-r--r-- | source/blender/python/mathutils/mathutils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/python/mathutils/mathutils.h b/source/blender/python/mathutils/mathutils.h index 31ad75b3906..ab78009ff89 100644 --- a/source/blender/python/mathutils/mathutils.h +++ b/source/blender/python/mathutils/mathutils.h @@ -170,7 +170,7 @@ Py_hash_t mathutils_array_hash(const float *float_array, size_t array_len); int column_vector_multiplication(float rvec[4], VectorObject *vec, MatrixObject *mat); #ifndef MATH_STANDALONE -/* dynstr as python string utility funcions */ +/* dynstr as python string utility functions */ PyObject *mathutils_dynstr_to_py(struct DynStr *ds); #endif |