diff options
Diffstat (limited to 'source/blender/blenkernel/intern/particle_distribute.c')
-rw-r--r-- | source/blender/blenkernel/intern/particle_distribute.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c index e0dccd4d14a..fad93245a04 100644 --- a/source/blender/blenkernel/intern/particle_distribute.c +++ b/source/blender/blenkernel/intern/particle_distribute.c @@ -382,7 +382,7 @@ static void init_mv_jit(float *jit, int num, int seed2, float amount) x -= (float)floor(x); } - jit2 = MEM_mallocN(12 + 2 * sizeof(float) * num, "initjit"); + jit2 = MEM_mallocN(12 + sizeof(float[2]) * num, "initjit"); for (i = 0; i < 4; i++) { BLI_jitterate1((float(*)[2])jit, (float(*)[2])jit2, num, rad1); @@ -829,22 +829,20 @@ static int distribute_compare_orig_index(const void *p1, const void *p2, void *u if (index1 < index2) { return -1; } - else if (index1 == index2) { + if (index1 == index2) { /* this pointer comparison appears to make qsort stable for glibc, * and apparently on solaris too, makes the renders reproducible */ if (p1 < p2) { return -1; } - else if (p1 == p2) { + if (p1 == p2) { return 0; } - else { - return 1; - } - } - else { + return 1; } + + return 1; } static void distribute_invalid(ParticleSimulationData *sim, int from) @@ -1282,7 +1280,7 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, hammersley_create(jit, jitlevel + 1, psys->seed, part->jitfac); } BLI_array_randomize( - jit, 2 * sizeof(float), jitlevel, psys->seed); /* for custom jit or even distribution */ + jit, sizeof(float[2]), jitlevel, psys->seed); /* for custom jit or even distribution */ } /* Setup things for threaded distribution */ |