[Bf-blender-cvs] [e8220dea606] blender-v2.81-release: GPU: prevent assert for zero length arrays

Campbell Barton noreply at git.blender.org
Mon Oct 14 09:43:24 CEST 2019


Commit: e8220dea606d0db5fa554e83ff969de19b95a6e9
Author: Campbell Barton
Date:   Mon Oct 14 18:37:31 2019 +1100
Branches: blender-v2.81-release
https://developer.blender.org/rBe8220dea606d0db5fa554e83ff969de19b95a6e9

GPU: prevent assert for zero length arrays

This could happen with the build modifier.

===================================================================

M	source/blender/gpu/intern/gpu_element.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_element.c b/source/blender/gpu/intern/gpu_element.c
index 166a6236893..518829d1c78 100644
--- a/source/blender/gpu/intern/gpu_element.c
+++ b/source/blender/gpu/intern/gpu_element.c
@@ -243,7 +243,7 @@ GPUIndexBuf *GPU_indexbuf_create_subrange(GPUIndexBuf *elem_src, uint start, uin
 {
   GPUIndexBuf *elem = MEM_callocN(sizeof(GPUIndexBuf), "GPUIndexBuf");
   BLI_assert(elem_src && !elem_src->is_subrange);
-  BLI_assert(start + length <= elem_src->index_len);
+  BLI_assert((length == 0) || (start + length <= elem_src->index_len));
 #if GPU_TRACK_INDEX_RANGE
   elem->index_type = elem_src->index_type;
   elem->gl_index_type = elem_src->gl_index_type;



More information about the Bf-blender-cvs mailing list