diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-18 03:50:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-18 03:52:38 +0400 |
| commit | ec55074f89220ba729e2b84058a3a55feb13ab34 (patch) | |
| tree | 31d0126d1d3b6223fdc44c6387afa452b052780b /source/blender/blenkernel/intern | |
| parent | 4d44f70d5ff7f4948be85f67f2d88e9df799b532 (diff) | |
Code cleanup: jitter, use 2d float array
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 1 |
4 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index b3e0bfa387b..913edba753a 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -1829,7 +1829,7 @@ static void statvis_calc_thickness( if (use_jit) { int j; BLI_assert(samples < 32); - BLI_jitter_init(jit_ofs[0], samples); + BLI_jitter_init(jit_ofs, samples); for (j = 0; j < samples; j++) { uv_from_jitter_v2(jit_ofs[j]); diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index fc18a204526..91d12d39af4 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -55,7 +55,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_noise.h" -#include "BLI_jitter.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 92b2876cb78..32f8ba920e6 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -690,7 +690,7 @@ static void hammersley_create(float *out, int n, int seed, float amount) } } -/* modified copy from effect.c */ +/* almost exact copy of BLI_jitter_init */ static void init_mv_jit(float *jit, int num, int seed2, float amount) { RNG *rng; @@ -721,9 +721,9 @@ static void init_mv_jit(float *jit, int num, int seed2, float amount) jit2= MEM_mallocN(12 + 2*sizeof(float)*num, "initjit"); for (i=0 ; i<4 ; i++) { - BLI_jitterate1(jit, jit2, num, rad1); - BLI_jitterate1(jit, jit2, num, rad1); - BLI_jitterate2(jit, jit2, num, rad2); + BLI_jitterate1((float (*)[2])jit, (float (*)[2])jit2, num, rad1); + BLI_jitterate1((float (*)[2])jit, (float (*)[2])jit2, num, rad1); + BLI_jitterate2((float (*)[2])jit, (float (*)[2])jit2, num, rad2); } MEM_freeN(jit2); BLI_rng_free(rng); diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index d8c27d4468c..5e7f1983fe8 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -44,7 +44,6 @@ #include "BLI_linklist.h" #include "BLI_rand.h" -#include "BLI_jitter.h" #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_edgehash.h" |