diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-06-02 11:42:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-06-02 11:42:09 +0300 |
| commit | cc7b8170998d2cd85a3572cf8ef18a8425e4af00 (patch) | |
| tree | 7297625a7b4723ce1f8c2774d9b2cf62cee44f28 /source | |
| parent | 0ce98b1ffbd59ff6d9ee3933afe0d2c7286c70d7 (diff) | |
Minor edits to last commit
Failed with chunk merging disabled
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/intern/array_store.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenlib/intern/array_store.c b/source/blender/blenlib/intern/array_store.c index 0b53be05e84..1bdb37051eb 100644 --- a/source/blender/blenlib/intern/array_store.c +++ b/source/blender/blenlib/intern/array_store.c @@ -601,10 +601,11 @@ static void bchunk_list_append_data( const ubyte *data, const size_t data_len) { BLI_assert(data_len != 0); - BLI_assert(data_len <= info->chunk_byte_size_max); // printf("data_len: %d\n", data_len); #ifdef USE_MERGE_CHUNKS + BLI_assert(data_len <= info->chunk_byte_size_max); + if (!BLI_listbase_is_empty(&chunk_list->chunk_refs)) { BChunkRef *cref = chunk_list->chunk_refs.last; BChunk *chunk_prev = cref->link; @@ -691,9 +692,6 @@ static void bchunk_list_append_data_n( BLI_assert(((BChunkRef *)chunk_list->chunk_refs.last)->link->data_len >= info->chunk_byte_size_min); } #endif - - ASSERT_CHUNKLIST_SIZE(chunk_list, data_len); - ASSERT_CHUNKLIST_DATA(chunk_list, data); } static void bchunk_list_append( |