[Bf-blender-cvs] [8828ded5644] temp-T88822-gpu-thread-safe-index-builder: Merge branch 'master' into temp-T88822-gpu-thread-safe-index-builder

[Jeroen Bakker]

Commit: 8828ded5644bf498d02524bbd4be3478a640ceb3
Author: Jeroen Bakker
Date:   Mon Jun 7 13:53:02 2021 +0200
Branches: temp-T88822-gpu-thread-safe-index-builder
https://developer.blender.org/rB8828ded5644bf498d02524bbd4be3478a640ceb3

Merge branch 'master' into temp-T88822-gpu-thread-safe-index-builder

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



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

diff --cc source/blender/gpu/GPU_index_buffer.h
index 369c7dca5dd,4e8d854c7ce..03d60c60b4b
--- a/source/blender/gpu/GPU_index_buffer.h
+++ b/source/blender/gpu/GPU_index_buffer.h
@@@ -40,9 -40,10 +40,11 @@@ typedef struct GPUIndexBufBuilder 
    uint max_allowed_index;
    uint max_index_len;
    uint index_len;
+   uint index_min;
+   uint index_max;
    GPUPrimType prim_type;
    uint32_t *data;
 +  const struct GPUIndexBufBuilder *parent;
  } GPUIndexBufBuilder;
  
  /* supports all primitive types. */
diff --cc source/blender/gpu/intern/gpu_index_buffer.cc
index 4bd25399d8e,9f283a3a944..3b313080453
--- a/source/blender/gpu/intern/gpu_index_buffer.cc
+++ b/source/blender/gpu/intern/gpu_index_buffer.cc
@@@ -53,9 -52,10 +53,11 @@@ void GPU_indexbuf_init_ex(GPUIndexBufBu
    builder->max_allowed_index = vertex_len - 1;
    builder->max_index_len = index_len;
    builder->index_len = 0;  // start empty
+   builder->index_min = UINT32_MAX;
+   builder->index_max = 0;
    builder->prim_type = prim_type;
    builder->data = (uint *)MEM_callocN(builder->max_index_len * sizeof(uint), "GPUIndexBuf data");
 +  builder->parent = nullptr;
  }
  
  void GPU_indexbuf_init(GPUIndexBufBuilder *builder,