[Bf-blender-cvs] [c12b96e] compositor-2016: Minor edits to last commit
Campbell Barton
noreply at git.blender.org
Wed Jun 8 21:52:27 CEST 2016
Commit: c12b96e8ab90d371a51002050d8bfa0a83e70ed5
Author: Campbell Barton
Date: Thu Jun 2 18:42:09 2016 +1000
Branches: compositor-2016
https://developer.blender.org/rBc12b96e8ab90d371a51002050d8bfa0a83e70ed5
Minor edits to last commit
Failed with chunk merging disabled
===================================================================
M source/blender/blenlib/intern/array_store.c
===================================================================
diff --git a/source/blender/blenlib/intern/array_store.c b/source/blender/blenlib/intern/array_store.c
index 0b53be0..1bdb3705 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(
More information about the Bf-blender-cvs
mailing list