diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-05-16 06:01:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-16 06:01:26 +0300 |
commit | 57660aac743a70eea0b917ae92dd5d6bdb1b12a9 (patch) | |
tree | 59b23a0e8540e72c1d98fed5e5d75d7214482c2e /source/blender/blenlib/intern | |
parent | 5a90542d3d4ba1a193975a3cb9c50eec1f6a8c8a (diff) | |
parent | d508b69e44bb3c5911d7716048c28fe0dc5e609b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/array_store.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/array_store.c b/source/blender/blenlib/intern/array_store.c index 295b39c1a2f..5d1b2433084 100644 --- a/source/blender/blenlib/intern/array_store.c +++ b/source/blender/blenlib/intern/array_store.c @@ -878,7 +878,7 @@ static hash_key key_from_chunk_ref( { /* in C, will fill in a reusable array */ BChunk *chunk = cref->link; - BLI_assert(info->accum_read_ahead_bytes * info->chunk_stride); + BLI_assert((info->accum_read_ahead_bytes * info->chunk_stride) != 0); if (info->accum_read_ahead_bytes <= chunk->data_len) { hash_key key; |