Code cleanup: jitter, use 2d float array

5 files changed, 4 insertions, 6 deletions

diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c
index 2fb723faa12..fa47593bbe4 100644
--- a/source/blender/render/intern/source/initrender.c
+++ b/source/blender/render/intern/source/initrender.c
@@ -92,10 +92,10 @@ static void init_render_jit(Render *re)
 	
 	if (lastjit != re->r.osa || last_mblur_jit != re->r.mblur_samples) {
 		memset(jit, 0, sizeof(jit));
-		BLI_jitter_init(jit[0], re->r.osa);
+		BLI_jitter_init(jit, re->r.osa);
 		
 		memset(mblur_jit, 0, sizeof(mblur_jit));
-		BLI_jitter_init(mblur_jit[0], re->r.mblur_samples);
+		BLI_jitter_init(mblur_jit, re->r.mblur_samples);
 	}
 	
 	lastjit = re->r.osa;
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 6dd2692f52e..ae5b9ec5999 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -42,7 +42,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_cpu.h"
-#include "BLI_jitter.h"
 #include "BLI_math.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index c3ca3ee4559..a6f37f2670c 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -41,7 +41,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_jitter.h"
 #include "BLI_rand.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c
index 0c3bf85cd24..9010cf8917e 100644
--- a/source/blender/render/intern/source/shadbuf.c
+++ b/source/blender/render/intern/source/shadbuf.c
@@ -141,7 +141,7 @@ static float *give_jitter_tab(int samp)
 
 	if (ctab[samp]==0) {
 		ctab[samp]= 1;
-		BLI_jitter_init(jit[offset], samp*samp);
+		BLI_jitter_init((float (*)[2])jit[offset], samp*samp);
 	}
 		
 	return jit[offset];
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index 37cf9ad76c3..a74d6efbc0b 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -3066,7 +3066,7 @@ void RE_zbuf_accumulate_vecblur(NodeBlurData *nbd, int xsize, int ysize, float *
 	/* has to become static, the init-jit calls a random-seed, screwing up texture noise node */
 	if (firsttime) {
 		firsttime= 0;
-		BLI_jitter_init(jit[0], 256);
+		BLI_jitter_init(jit, 256);
 	}
 	
 	memset(newrect, 0, sizeof(float)*xsize*ysize*4);