From d733826708f9b562687b78424e5c0835cba8c3c9 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 9 Jun 2016 17:53:51 +0200 Subject: Fix T48614: Blender from buildbot crash when Separate selection in this particular scene. Regression from recent rB2c5dc66d5effd4072f438afb, if last item of last chunk of a mempool was valid, it would not be returned by mempool iterator step, which would always return NULL in that case. --- source/blender/blenlib/intern/BLI_mempool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenlib/intern/BLI_mempool.c') diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c index b7a51f2c48e..783dba5510c 100644 --- a/source/blender/blenlib/intern/BLI_mempool.c +++ b/source/blender/blenlib/intern/BLI_mempool.c @@ -622,7 +622,7 @@ void *BLI_mempool_iterstep(BLI_mempool_iter *iter) iter->curindex = 0; iter->curchunk = iter->curchunk->next; if (iter->curchunk == NULL) { - return NULL; + return (ret->freeword == FREEWORD) ? NULL : ret; } curnode = CHUNK_DATA(iter->curchunk); } -- cgit v1.2.3