branches/2-44-stable

Merge from trunk:
	revision 11514
	revision 11524
This commit is contained in:
Diego Borghetti 2007-08-09 15:05:41 +00:00
parent a99b682554
commit d1ba0d2176
2 changed files with 3 additions and 3 deletions

View File

@ -1924,8 +1924,8 @@ void insert_vert_ipo(IpoCurve *icu, float x, float y)
bezt= icu->bezt;
for(a=0; a<=icu->totvert; a++, bezt++) {
/* no double points */
if(a<icu->totvert && IS_EQ(bezt->vec[1][0], x)) {
/* no double points - threshold to determine this should be good enough */
if(a<icu->totvert && IS_EQT(bezt->vec[1][0], x, 0.00001)) {
*(bezt)= beztr;
break;
}

View File

@ -522,7 +522,7 @@ int main(int argc, char** argv)
printf("error: window size too small.\n");
}
if (error || argc == 1)
if (error )
{
usage(argv[0]);
return 0;