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

fixes to mathutils from Andew Hale

Browse Source 
- docstring edits
- normalize ignores W axis as its supposed to.
This commit is contained in:
Campbell Barton
2012-01-03 14:34:41 +00:00
parent 268ca6b2f7
commit f0e3c3c68f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -334,18 +334,18 @@ PyDoc_STRVAR(Vector_normalize_doc,
"\n" "\n"
" Normalize the vector, making the length of the vector always 1.0.\n" " Normalize the vector, making the length of the vector always 1.0.\n"
"\n" "\n"
" .. warning:: Normalizing a vector where all values are zero results\n" " .. warning:: Normalizing a vector where all values are zero has no effect.\n"
" in all axis having a nan value (not a number).\n"
"\n" "\n"
" .. note:: Normalize works for vectors of all sizes,\n" " .. note:: Normalize works for vectors of all sizes,\n"
" however 4D Vectors w axis is left untouched.\n" " however 4D Vectors w axis is left untouched.\n"
); );
static PyObject *Vector_normalize(VectorObject *self) static PyObject *Vector_normalize(VectorObject *self)
{ {
int size = (self->size == 4 ? 3 : self->size);
if (BaseMath_ReadCallback(self) == -1) if (BaseMath_ReadCallback(self) == -1)
return NULL; return NULL;
normalize_vn(self->vec, self->size); normalize_vn(self->vec, size);
(void)BaseMath_WriteCallback(self); (void)BaseMath_WriteCallback(self);
Py_RETURN_NONE; Py_RETURN_NONE;
@@ -1480,10 +1480,10 @@ static PyObject *Vector_isub(PyObject *v1, PyObject *v2)
mulplication*/ mulplication*/
/* COLUMN VECTOR Multiplication (Vector X Matrix) /* COLUMN VECTOR Multiplication (Matrix X Vector)
* [a] * [1][4][7] * [1][4][7] [a]
* [b] * [2][5][8] * [2][5][8] * [b]
* [c] * [3][6][9] * [3][6][9] [c]
* *
* note: vector/matrix multiplication IS NOT COMMUTATIVE!!!! * note: vector/matrix multiplication IS NOT COMMUTATIVE!!!!
* note: assume read callbacks have been done first. * note: assume read callbacks have been done first.
@@ -1500,8 +1500,8 @@ int column_vector_multiplication(float r_vec[MAX_DIMENSIONS], VectorObject *vec,
else { else {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"matrix * vector: " "matrix * vector: "
"matrix.row_size and len(vector) must be the same, " "len(matrix.col) and len(vector) must be the same, "
"except for 3D vector * 4x4 matrix."); "except for 4x4 matrix * 3D vector.");
return -1; return -1;
} }
} }