archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-07-27 17:41:58 +10:00
parent 2032e4ec9e fe8d8aa27e
commit 0093212be9
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/python/mathutils/mathutils_Vector.c
View File

@@ -1127,23 +1127,17 @@ PyDoc_STRVAR(Vector_project_doc,
static PyObject *Vector_project(VectorObject *self, PyObject *value) static PyObject *Vector_project(VectorObject *self, PyObject *value)
{ {
const int size = self->size; const int size = self->size;
float tvec[MAX_DIMENSIONS]; float *tvec;
float vec[MAX_DIMENSIONS];
double dot = 0.0f, dot2 = 0.0f; double dot = 0.0f, dot2 = 0.0f;
int x; int x;
if (mathutils_array_parse(tvec, size, size, value, "Vector.project(other), invalid 'other' arg") == -1)
return NULL;
if (self->size > 4) {
PyErr_SetString(PyExc_ValueError,
"Vector must be 2D, 3D or 4D");
return NULL;
}
if (BaseMath_ReadCallback(self) == -1) if (BaseMath_ReadCallback(self) == -1)
return NULL; return NULL;
if (mathutils_array_parse_alloc(&tvec, size, value, "Vector.project(other), invalid 'other' arg") == -1) {
return NULL;
}
/* get dot products */ /* get dot products */
for (x = 0; x < size; x++) { for (x = 0; x < size; x++) {
dot += (double)(self->vec[x] * tvec[x]); dot += (double)(self->vec[x] * tvec[x]);
@@ -1152,9 +1146,9 @@ static PyObject *Vector_project(VectorObject *self, PyObject *value)
/* projection */ /* projection */
dot /= dot2; dot /= dot2;
for (x = 0; x < size; x++) { for (x = 0; x < size; x++) {
vec[x] = (float)dot * tvec[x]; tvec[x] *= (float)dot;
} }
return Vector_CreatePyObject(vec, size, Py_TYPE(self)); return Vector_CreatePyObject_alloc(tvec, size, Py_TYPE(self));
} }
PyDoc_STRVAR(Vector_lerp_doc, PyDoc_STRVAR(Vector_lerp_doc,