diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-09 18:53:51 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-09 18:53:51 +0300 |
| commit | d733826708f9b562687b78424e5c0835cba8c3c9 (patch) | |
| tree | 216aff5388a1c8ff11e9629cb9a7fd4504227424 | |
| parent | 20f0e2f342b572ce776ef22b2debcf9532894dea (diff) | |
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.
| -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 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); } |