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

==Python==

Browse Source 
Small bug reported on irc, matrix.translationPart didn't check bounds
properly (needed to use || instead of &&). Also fixed similar bugs in
rotationPart and rich compare.
This commit is contained in:
Brecht Van Lommel
2006-02-15 22:31:43 +00:00
parent 55610ac7c1
commit 9fedbd6c51
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/python/api2_2x/matrix.c
View File

@@ -154,7 +154,7 @@ PyObject *Matrix_TranslationPart(MatrixObject * self)
{
float vec[4];
if(self->colSize < 3 && self->rowSize < 4){
if(self->colSize < 3 || self->rowSize < 4){
return EXPP_ReturnPyObjError(PyExc_AttributeError,
"Matrix.translationPart: inappropriate matrix size\n");
}
@@ -171,7 +171,7 @@ PyObject *Matrix_RotationPart(MatrixObject * self)
float mat[16] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f};
if(self->colSize < 3 && self->rowSize < 3){
if(self->colSize < 3 || self->rowSize < 3){
return EXPP_ReturnPyObjError(PyExc_AttributeError,
"Matrix.rotationPart: inappropriate matrix size\n");
}
@@ -397,7 +397,7 @@ static PyObject* Matrix_richcmpr(PyObject *objectA, PyObject *objectB, int compa
matA = (MatrixObject*)objectA;
matB = (MatrixObject*)objectB;
if (matA->colSize != matB->colSize && matA->rowSize != matB->rowSize){
if (matA->colSize != matB->colSize || matA->rowSize != matB->rowSize){
if (comparison_type == Py_NE){
return EXPP_incr_ret(Py_True);
}else{