diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-09-08 13:16:41 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-09-08 13:16:41 +0300 |
| commit | 788c75ed879fb25a35c0a0e9245df7aeaae2f4ab (patch) | |
| tree | 3b1c315078e257e0401904860f9ec90fe60390ee /source/blender/blenlib/intern/task.c | |
| parent | 1ffd9714b930dbef8059403d69650476f625f554 (diff) | |
| parent | 45f833c21dcfad4d1d7045987bb8b69d6aab05be (diff) | |
Merge branch 'master' into viewport_bvh_selectviewport_bvh_select
Diffstat (limited to 'source/blender/blenlib/intern/task.c')
| -rw-r--r-- | source/blender/blenlib/intern/task.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c index bd7b7f9cdbd..9d4d40e1eae 100644 --- a/source/blender/blenlib/intern/task.c +++ b/source/blender/blenlib/intern/task.c @@ -780,9 +780,10 @@ BLI_INLINE bool parallel_range_next_iter_get( ParallelRangeState * __restrict state, int * __restrict iter, int * __restrict count) { - uint32_t previter = atomic_fetch_and_add_uint32((uint32_t *)(&state->iter), state->chunk_size); + uint32_t uval = atomic_fetch_and_add_uint32((uint32_t *)(&state->iter), state->chunk_size); + int previter = *(int32_t*)&uval; - *iter = (int)previter; + *iter = previter; *count = max_ii(0, min_ii(state->chunk_size, state->stop - previter)); return (previter < state->stop); |