diff --git a/source/blender/blenlib/BLI_hash.h b/source/blender/blenlib/BLI_hash.h index 9ca7898d6b89616351362712a9704900cbc85f1b..f74010479a98f6c5f616720013d0d839032da3dd 100644 --- a/source/blender/blenlib/BLI_hash.h +++ b/source/blender/blenlib/BLI_hash.h @@ -72,7 +72,7 @@ BLI_INLINE void BLI_hash_pointer_to_color(const void *ptr, int *r, int *g, int * { size_t val = (size_t)ptr; const size_t hash_a = BLI_hash_int(val & 0x0000ffff); - const size_t hash_b = BLI_hash_int((val & 0xffff0000) >> 32); + const size_t hash_b = BLI_hash_int((uint)((val & 0xffff0000) >> 32)); const size_t hash = hash_a ^ (hash_b + 0x9e3779b9 + (hash_a << 6) + (hash_a >> 2)); *r = (hash & 0xff0000) >> 16; diff --git a/source/blender/python/mathutils/mathutils_geometry.c b/source/blender/python/mathutils/mathutils_geometry.c index fa0d271f7d327c304f7aedd616c18a6e5fa9f540..d935949fd8c40f3802d630b394115494f0e7c87e 100644 --- a/source/blender/python/mathutils/mathutils_geometry.c +++ b/source/blender/python/mathutils/mathutils_geometry.c @@ -742,7 +742,7 @@ static PyObject *M_Geometry_intersect_point_line(PyObject *UNUSED(self), PyObjec float lambda; PyObject *ret; int size = 2; - + if (!PyArg_ParseTuple( args, "OOO:intersect_point_line", &py_pt, &py_line_a, &py_line_b)) @@ -760,7 +760,7 @@ static PyObject *M_Geometry_intersect_point_line(PyObject *UNUSED(self), PyObjec /* do the calculation */ lambda = closest_to_line_v3(pt_out, pt, line_a, line_b); - + ret = PyTuple_New(2); PyTuple_SET_ITEMS(ret, Vector_CreatePyObject(pt_out, size, NULL), @@ -882,7 +882,7 @@ static PyObject *M_Geometry_intersect_point_quad_2d(PyObject *UNUSED(self), PyOb PyObject *py_pt, *py_quad[4]; float pt[2], quad[4][2]; int i; - + if (!PyArg_ParseTuple( args, "OOOOO:intersect_point_quad_2d", &py_pt, UNPACK4_EX(&, py_quad, ))) @@ -954,12 +954,12 @@ PyDoc_STRVAR(M_Geometry_barycentric_transform_doc, " :type tri_a2: :class:`mathutils.Vector`\n" " :arg tri_a3: source triangle vertex.\n" " :type tri_a3: :class:`mathutils.Vector`\n" -" :arg tri_a1: target triangle vertex.\n" -" :type tri_a1: :class:`mathutils.Vector`\n" -" :arg tri_a2: target triangle vertex.\n" -" :type tri_a2: :class:`mathutils.Vector`\n" -" :arg tri_a3: target triangle vertex.\n" -" :type tri_a3: :class:`mathutils.Vector`\n" +" :arg tri_b1: target triangle vertex.\n" +" :type tri_b1: :class:`mathutils.Vector`\n" +" :arg tri_b2: target triangle vertex.\n" +" :type tri_b2: :class:`mathutils.Vector`\n" +" :arg tri_b3: target triangle vertex.\n" +" :type tri_b3: :class:`mathutils.Vector`\n" " :return: The transformed point\n" " :rtype: :class:`mathutils.Vector`'s\n" );