diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-24 06:30:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-24 06:30:36 +0300 |
| commit | f3b384862df83dfca8b7fbad3dc6c5c07d0cecaf (patch) | |
| tree | eb10e834c74029c07ea0e5e06531af5cd693d64c /source/blender/blenlib | |
| parent | f8fc77ec8481fbbe253ec73d701beab278fdeaf3 (diff) | |
| parent | c62e3a05b08b18e2767590a51bd9decc274106a3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/BLI_mempool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c index c90f9e300b7..5b13f129ad4 100644 --- a/source/blender/blenlib/intern/BLI_mempool.c +++ b/source/blender/blenlib/intern/BLI_mempool.c @@ -628,7 +628,7 @@ static void *bli_mempool_iternext(BLI_mempool_iter *iter) while (1) { iter->curchunk = *iter->curchunk_threaded_shared; if (iter->curchunk == NULL) { - break; + return ret; } if (atomic_cas_ptr((void **)iter->curchunk_threaded_shared, iter->curchunk, iter->curchunk->next) == iter->curchunk) { break; |