blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2017-11-24 14:30:36 +11:00
parent f8fc77ec84 c62e3a05b0
commit f3b384862d
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/intern/BLI_mempool.c
View File

@ -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;

2
source/blender/bmesh/intern/bmesh_iterators_inline.h
View File

@ -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: