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

renamed a var to avoid name conflicts...

Browse Source 
In the header its just this..
-void initjit(float *jit, int num)
+void initjit(float *jitarr, int num)

its respectively renamed in jitter.c

Kent
This commit is contained in:
Kent Mein
2002-12-30 07:15:47 +00:00
parent e9a7e30758
commit 5e6d6710c4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/render/intern/include/jitter.h
View File

@@ -41,7 +41,7 @@ extern "C" {
extern float jit[64][2]; extern float jit[64][2];
void initjit(float *jit, int num); void initjit(float *jitarr, int num);
#ifdef __cplusplus #ifdef __cplusplus
} }

12
source/blender/render/intern/source/jitter.c
View File

@@ -150,7 +150,7 @@ void RE_jitterate2(float *jit1, float *jit2, int num, float rad2)
} }
void initjit(float *jit, int num) void initjit(float *jitarr, int num)
{ {
float *jit2, x, rad1, rad2, rad3; float *jit2, x, rad1, rad2, rad3;
int i; int i;
@@ -165,16 +165,16 @@ void initjit(float *jit, int num)
BLI_srand(31415926 + num); BLI_srand(31415926 + num);
x= 0; x= 0;
for(i=0; i<2*num; i+=2) { for(i=0; i<2*num; i+=2) {
jit[i]= x+ rad1*(0.5-BLI_drand()); jitarr[i]= x+ rad1*(0.5-BLI_drand());
jit[i+1]= ((float)i/2)/num +rad1*(0.5-BLI_drand()); jitarr[i+1]= ((float)i/2)/num +rad1*(0.5-BLI_drand());
x+= rad3; x+= rad3;
x -= floor(x); x -= floor(x);
} }
for (i=0 ; i<24 ; i++) { for (i=0 ; i<24 ; i++) {
RE_jitterate1(jit, jit2, num, rad1); RE_jitterate1(jitarr, jit2, num, rad1);
RE_jitterate1(jit, jit2, num, rad1); RE_jitterate1(jitarr, jit2, num, rad1);
RE_jitterate2(jit, jit2, num, rad2); RE_jitterate2(jitarr, jit2, num, rad2);
} }
MEM_freeN(jit2); MEM_freeN(jit2);