diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 17:36:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 17:36:30 +0300 |
| commit | 61d27db35967710421ab92748e09624db068258d (patch) | |
| tree | bc0a53ad97072a3bacb9cf5265abb19d0b511ecd /source/blender/blenlib/intern/rand.c | |
| parent | 56173e512cab020a5bc96e6d3069641a03d47fbe (diff) | |
| parent | 5513da65b24a3ce77b1709acea841475115f3a7a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib/intern/rand.c')
| -rw-r--r-- | source/blender/blenlib/intern/rand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/rand.c b/source/blender/blenlib/intern/rand.c index 557f0d79270..75b50caf367 100644 --- a/source/blender/blenlib/intern/rand.c +++ b/source/blender/blenlib/intern/rand.c @@ -309,7 +309,7 @@ void BLI_thread_srandom(int thread, unsigned int seed) { if (thread >= BLENDER_MAX_THREADS) thread = 0; - + BLI_rng_seed(&rng_tab[thread], seed + hash[seed & 255]); seed = BLI_rng_get_uint(&rng_tab[thread]); BLI_rng_seed(&rng_tab[thread], seed + hash[seed & 255]); @@ -335,11 +335,11 @@ RNG_THREAD_ARRAY *BLI_rng_threaded_new(void) { unsigned int i; RNG_THREAD_ARRAY *rngarr = MEM_mallocN(sizeof(RNG_THREAD_ARRAY), "random_array"); - + for (i = 0; i < BLENDER_MAX_THREADS; i++) { BLI_rng_srandom(&rngarr->rng_tab[i], (unsigned int)clock()); } - + return rngarr; } |