sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

replace dutch variable name 'aantal' with 'tot'

Browse Source
This commit is contained in:
Campbell Barton 2011-08-01 02:58:44 +00:00
parent f48b906261
commit 9da712a581
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/curve.c
View File

@ -580,19 +580,19 @@ void addNurbPointsBezier(Nurb *nu, int number)
/* ~~~~~~~~~~~~~~~~~~~~Non Uniform Rational B Spline calculations ~~~~~~~~~~~ */ /* ~~~~~~~~~~~~~~~~~~~~Non Uniform Rational B Spline calculations ~~~~~~~~~~~ */
static void calcknots(float *knots, const short aantal, const short order, const short flag) static void calcknots(float *knots, const short tot, const short order, const short flag)
{ {
/* knots: number of pnts NOT corrected for cyclic */ /* knots: number of pnts NOT corrected for cyclic */
const int t= aantal + order; const int tot_order= tot + order;
float k; float k;
int a; int a;
switch(flag & (CU_NURB_ENDPOINT|CU_NURB_BEZIER)) { switch(flag & (CU_NURB_ENDPOINT|CU_NURB_BEZIER)) {
case CU_NURB_ENDPOINT: case CU_NURB_ENDPOINT:
k= 0.0; k= 0.0;
for(a=1;a<=t;a++) { for(a=1; a <= tot_order; a++) {
knots[a-1]= k; knots[a-1]= k;
if(a>=order && a<=aantal) k+= 1.0f; if(a >= order && a <= tot) k+= 1.0f;
} }
break; break;
case CU_NURB_BEZIER: case CU_NURB_BEZIER:
@ -600,15 +600,15 @@ static void calcknots(float *knots, const short aantal, const short order, const
* if this is not enforced, the displist will be corrupt */ * if this is not enforced, the displist will be corrupt */
if(order==4) { if(order==4) {
k= 0.34; k= 0.34;
for(a=0;a<t;a++) { for(a=0; a < tot_order; a++) {
knots[a]= floorf(k); knots[a]= floorf(k);
k+= (1.0f/3.0f); k+= (1.0f/3.0f);
} }
} }
else if(order==3) { else if(order==3) {
k= 0.6f; k= 0.6f;
for(a=0;a<t;a++) { for(a=0; a < tot_order; a++) {
if(a>=order && a<=aantal) k+= 0.5f; if(a >= order && a <= tot) k+= 0.5f;
knots[a]= floorf(k); knots[a]= floorf(k);
} }
} }
@ -617,7 +617,7 @@ static void calcknots(float *knots, const short aantal, const short order, const
} }
break; break;
default: default:
for(a=0;a<t;a++) { for(a=0; a < tot_order; a++) {
knots[a]= (float)a; knots[a]= (float)a;
} }
break; break;

8
source/blender/blenkernel/intern/key.c
View File

@ -474,20 +474,20 @@ static int setkeys(float fac, ListBase *lb, KeyBlock *k[], float *t, int cycl)
} }
static void flerp(int aantal, float *in, float *f0, float *f1, float *f2, float *f3, float *t) static void flerp(int tot, float *in, float *f0, float *f1, float *f2, float *f3, float *t)
{ {
int a; int a;
for(a=0; a<aantal; a++) { for(a=0; a<tot; a++) {
in[a]= t[0]*f0[a]+t[1]*f1[a]+t[2]*f2[a]+t[3]*f3[a]; in[a]= t[0]*f0[a]+t[1]*f1[a]+t[2]*f2[a]+t[3]*f3[a];
} }
} }
static void rel_flerp(int aantal, float *in, float *ref, float *out, float fac) static void rel_flerp(int tot, float *in, float *ref, float *out, float fac)
{ {
int a; int a;
for(a=0; a<aantal; a++) { for(a=0; a<tot; a++) {
in[a]-= fac*(ref[a]-out[a]); in[a]-= fac*(ref[a]-out[a]);
} }
} }

6
source/blender/editors/space_view3d/view3d_select.c
View File

@ -889,14 +889,14 @@ static unsigned int samplerect(unsigned int *buf, int size, unsigned int dontdo)
{ {
Base *base; Base *base;
unsigned int *bufmin,*bufmax; unsigned int *bufmin,*bufmax;
int a,b,rc,tel,aantal,dirvec[4][2],maxob; int a,b,rc,tel,len,dirvec[4][2],maxob;
unsigned int retval=0; unsigned int retval=0;
base= LASTBASE; base= LASTBASE;
if(base==0) return 0; if(base==0) return 0;
maxob= base->selcol; maxob= base->selcol;
aantal= (size-1)/2; len= (size-1)/2;
rc= 0; rc= 0;
dirvec[0][0]= 1; dirvec[0][0]= 1;
@ -910,7 +910,7 @@ static unsigned int samplerect(unsigned int *buf, int size, unsigned int dontdo)
bufmin= buf; bufmin= buf;
bufmax= buf+ size*size; bufmax= buf+ size*size;
buf+= aantal*size+ aantal; buf+= len*size+ len;
for(tel=1;tel<=size;tel++) { for(tel=1;tel<=size;tel++) {