kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Minor edits to last commit

Browse Source 
Failed with chunk merging disabled
This commit is contained in:
Campbell Barton 2016-06-02 18:42:09 +10:00
parent 0ce98b1ffb
commit cc7b817099
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/intern/array_store.c
View File

@ -601,10 +601,11 @@ static void bchunk_list_append_data(
const ubyte *data, const size_t data_len) const ubyte *data, const size_t data_len)
{ {
BLI_assert(data_len != 0); BLI_assert(data_len != 0);
BLI_assert(data_len <= info->chunk_byte_size_max);
// printf("data_len: %d\n", data_len); // printf("data_len: %d\n", data_len);
#ifdef USE_MERGE_CHUNKS #ifdef USE_MERGE_CHUNKS
BLI_assert(data_len <= info->chunk_byte_size_max);
if (!BLI_listbase_is_empty(&chunk_list->chunk_refs)) { if (!BLI_listbase_is_empty(&chunk_list->chunk_refs)) {
BChunkRef *cref = chunk_list->chunk_refs.last; BChunkRef *cref = chunk_list->chunk_refs.last;
BChunk *chunk_prev = cref->link; 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); BLI_assert(((BChunkRef *)chunk_list->chunk_refs.last)->link->data_len >= info->chunk_byte_size_min);
} }
#endif #endif
ASSERT_CHUNKLIST_SIZE(chunk_list, data_len);
ASSERT_CHUNKLIST_DATA(chunk_list, data);
} }
static void bchunk_list_append( static void bchunk_list_append(