Revision: 38887
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38887
Author: campbellbarton
Date: 2011-08-01 02:58:44 +0000 (Mon, 01 Aug 2011)
Log Message:
-----------
replace dutch variable name 'aantal' with 'tot'
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2011-08-01
02:52:08 UTC (rev 38886)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2011-08-01
02:58:44 UTC (rev 38887)
@@ -580,19 +580,19 @@
/* ~~~~~~~~~~~~~~~~~~~~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 */
- const int t= aantal + order;
+ const int tot_order= tot + order;
float k;
int a;
switch(flag & (CU_NURB_ENDPOINT|CU_NURB_BEZIER)) {
case CU_NURB_ENDPOINT:
k= 0.0;
- for(a=1;a<=t;a++) {
+ for(a=1; a <= tot_order; a++) {
knots[a-1]= k;
- if(a>=order && a<=aantal) k+= 1.0f;
+ if(a >= order && a <= tot) k+= 1.0f;
}
break;
case CU_NURB_BEZIER:
@@ -600,15 +600,15 @@
* if this is not enforced, the displist will be corrupt */
if(order==4) {
k= 0.34;
- for(a=0;a<t;a++) {
+ for(a=0; a < tot_order; a++) {
knots[a]= floorf(k);
k+= (1.0f/3.0f);
}
}
else if(order==3) {
k= 0.6f;
- for(a=0;a<t;a++) {
- if(a>=order && a<=aantal) k+= 0.5f;
+ for(a=0; a < tot_order; a++) {
+ if(a >= order && a <= tot) k+= 0.5f;
knots[a]= floorf(k);
}
}
@@ -617,7 +617,7 @@
}
break;
default:
- for(a=0;a<t;a++) {
+ for(a=0; a < tot_order; a++) {
knots[a]= (float)a;
}
break;
Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c 2011-08-01
02:52:08 UTC (rev 38886)
+++ trunk/blender/source/blender/blenkernel/intern/key.c 2011-08-01
02:58:44 UTC (rev 38887)
@@ -474,20 +474,20 @@
}
-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;
- 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];
}
}
-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;
- for(a=0; a<aantal; a++) {
+ for(a=0; a<tot; a++) {
in[a]-= fac*(ref[a]-out[a]);
}
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c
2011-08-01 02:52:08 UTC (rev 38886)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c
2011-08-01 02:58:44 UTC (rev 38887)
@@ -889,14 +889,14 @@
{
Base *base;
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;
base= LASTBASE;
if(base==0) return 0;
maxob= base->selcol;
- aantal= (size-1)/2;
+ len= (size-1)/2;
rc= 0;
dirvec[0][0]= 1;
@@ -910,7 +910,7 @@
bufmin= buf;
bufmax= buf+ size*size;
- buf+= aantal*size+ aantal;
+ buf+= len*size+ len;
for(tel=1;tel<=size;tel++) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
