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 | |
| parent | f8fc77ec8481fbbe253ec73d701beab278fdeaf3 (diff) | |
| parent | c62e3a05b08b18e2767590a51bd9decc274106a3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/intern/BLI_mempool.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_iterators_inline.h | 2 |
2 files changed, 1 insertions, 3 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; diff --git a/source/blender/bmesh/intern/bmesh_iterators_inline.h b/source/blender/bmesh/intern/bmesh_iterators_inline.h index 32f0f4b67c4..88985d639cf 100644 --- a/source/blender/bmesh/intern/bmesh_iterators_inline.h +++ b/source/blender/bmesh/intern/bmesh_iterators_inline.h @@ -196,8 +196,6 @@ ATTR_NONNULL(1) BLI_INLINE void BM_iter_parallel( BMesh *bm, const char itype, TaskParallelMempoolFunc func, void *userdata, const bool use_threading) { - BLI_assert(bm != NULL); - /* inlining optimizes out this switch when called with the defined type */ switch ((BMIterType)itype) { case BM_VERTS_OF_MESH: |