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

BPython bug fixes:

Browse Source 
- Patch #2491: Mathutils.AngleBetweenVecs BUGFIX
http://projects.blender.org/tracker/?func=detail&aid=2491&group_id=9&atid=127

- #2607: Python String button can segfault if the allowable length is greater than 400
http://projects.blender.org/tracker/?func=detail&atid=125&aid=2607&group_id=9

- #2490: Vector == None gives warning
http://projects.blender.org/tracker/?func=detail&aid=2490&group_id=9&atid=125

- #2476: Image.Draw()
http://projects.blender.org/tracker/?func=detail&aid=2476&group_id=9&atid=125

All reported by Campbell, who also wrote the #2491 patch.  Ken Hughes provided patches for #2490 and #2476.  Thanks guys.
This commit is contained in:
Willian Padovani Germano
2005-05-25 04:52:52 +00:00
parent 524e411dbf
commit 2a1fe1b0cb
3 changed files with 64 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/blender/python/api2_2x/Mathutils.c
View File

@@ -25,7 +25,7 @@
*
* This is a new part of Blender.
*
* Contributor(s): Joseph Gilbert
* Contributor(s): Joseph Gilbert, Campbell Barton
*
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
@@ -369,8 +369,19 @@ static PyObject *M_Mathutils_DotVecs( PyObject * self, PyObject * args )
static PyObject *M_Mathutils_AngleBetweenVecs( PyObject * self,
PyObject * args )
{
// original vectors, makea copy of these
VectorObject *vec1;
VectorObject *vec2;
/* copy of the 2 input vectors, these can be normalized
without input vectors being normalized. bugfix
no need to use vector objects, just use floats
No Chance of 4D vectors getting in.
Use doubles, since floats will return nan when input vecs are large.*/
double vec1copy[3];
double vec2copy[3];
float norm;
double dot, angleRads;
int x;
@@ -386,30 +397,43 @@ static PyObject *M_Mathutils_AngleBetweenVecs( PyObject * self,
if( vec1->size > 3 || vec2->size > 3 )
return ( EXPP_ReturnPyObjError( PyExc_TypeError,
"only 2D,3D vectors are supported\n" ) );
//normalize vec1
/* Check for 2 vectors being the same */
if (vec1->size == 3 &&
vec1->vec[0] == vec2->vec[0] &&
vec1->vec[1] == vec2->vec[1] &&
vec1->vec[2] == vec2->vec[2])
return PyFloat_FromDouble( dot ); /* 2 points are the same, return zero */
else if (vec1->size == 2 &&
vec1->vec[0] == vec2->vec[0] &&
vec1->vec[1] == vec2->vec[1])
return PyFloat_FromDouble( dot ); /* 2 points are the same, return zero */
//normalize vec1copy
norm = 0.0f;
for( x = 0; x < vec1->size; x++ ) {
norm += vec1->vec[x] * vec1->vec[x];
vec1copy[x] = vec1->vec[x]; /* Assign new vector in the loop */
norm += vec1copy[x] * vec1copy[x];
}
norm = ( float ) sqrt( norm );
for( x = 0; x < vec1->size; x++ ) {
vec1->vec[x] /= norm;
vec1copy[x] /= norm;
}
//normalize vec2
//normalize vec2copy
norm = 0.0f;
for( x = 0; x < vec2->size; x++ ) {
norm += vec2->vec[x] * vec2->vec[x];
vec2copy[x] = vec2->vec[x]; /* Assign new vector in the loop */
norm += vec2copy[x] * vec2copy[x];
}
norm = ( float ) sqrt( norm );
for( x = 0; x < vec2->size; x++ ) {
vec2->vec[x] /= norm;
vec2copy[x] /= norm;
}
//dot product
for( x = 0; x < vec1->size; x++ ) {
dot += vec1->vec[x] * vec2->vec[x];
dot += vec1copy[x] * vec2copy[x];
}
//I believe saacos checks to see if the vectors are normalized