[Bf-blender-cvs] [ce46d56905c] temp-T88822-gpu-thread-safe-index-builder: Fix issue with recent merge.
Jeroen Bakker
noreply at git.blender.org
Mon Jun 7 14:52:21 CEST 2021
Commit: ce46d56905c245ae22a7eb53e4d3d9b4128f4e9e
Author: Jeroen Bakker
Date: Mon Jun 7 14:52:08 2021 +0200
Branches: temp-T88822-gpu-thread-safe-index-builder
https://developer.blender.org/rBce46d56905c245ae22a7eb53e4d3d9b4128f4e9e
Fix issue with recent merge.
===================================================================
M source/blender/gpu/intern/gpu_index_buffer.cc
===================================================================
diff --git a/source/blender/gpu/intern/gpu_index_buffer.cc b/source/blender/gpu/intern/gpu_index_buffer.cc
index 3b313080453..3cdcaac5544 100644
--- a/source/blender/gpu/intern/gpu_index_buffer.cc
+++ b/source/blender/gpu/intern/gpu_index_buffer.cc
@@ -93,6 +93,8 @@ void GPU_indexbuf_subbuilder_finish(GPUIndexBufBuilder *parent_builder,
{
BLI_assert(parent_builder == sub_builder->parent);
parent_builder->index_len = max_uu(parent_builder->index_len, sub_builder->index_len);
+ parent_builder->index_min = min_uu(parent_builder->index_min, sub_builder->index_min);
+ parent_builder->index_max = max_uu(parent_builder->index_max, sub_builder->index_max);
}
void GPU_indexbuf_add_generic_vert(GPUIndexBufBuilder *builder, uint v)
More information about the Bf-blender-cvs
mailing list