Merge branch 'master' into temp-ghash-experimentstemp-ghash-experiments

Note that 'store hash' feature was removed for now - to complex to maintain (conflicts)
and relatively easy to re-add if we ever really want this one day.

Conflicts:
	source/blender/blenlib/BLI_ghash.h
	source/blender/blenlib/intern/BLI_ghash.c
	source/blender/blenlib/intern/hash_mm2a.c
	source/blender/bmesh/tools/bmesh_region_match.c
	tests/gtests/blenlib/BLI_ghash_performance_test.cc
	tests/gtests/blenlib/BLI_ghash_test.cc
	tests/gtests/blenlib/CMakeLists.txt

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/python/mathutils/mathutils.c b/source/blender/python/mathutils/mathutils.c
index 7b51b08451b..361fbc8a005 100644
--- a/source/blender/python/mathutils/mathutils.c
+++ b/source/blender/python/mathutils/mathutils.c
@@ -110,7 +110,7 @@ Py_hash_t mathutils_array_hash(const float *array, size_t array_len)
 	return x;
 }
 
-/* helper functionm returns length of the 'value', -1 on error */
+/* helper function returns length of the 'value', -1 on error */
 int mathutils_array_parse(float *array, int array_min, int array_max, PyObject *value, const char *error_prefix)
 {
 	const int flag = array_max;
@@ -535,7 +535,7 @@ PyObject *BaseMathObject_freeze(BaseMathObject *self)
 
 	self->flag |= BASE_MATH_FLAG_IS_FROZEN;
 
-	return Py_INCREF_RET((PyObject *)self);;
+	return Py_INCREF_RET((PyObject *)self);
 }
 
 int BaseMathObject_traverse(BaseMathObject *self, visitproc visit, void *arg)