[Bf-blender-cvs] [5a716701e8c] blender2.8: GPU_batch: fix error w/ interior line removal
Campbell Barton
noreply at git.blender.org
Sat Jul 14 16:00:29 CEST 2018
Commit: 5a716701e8c769a9d24c5c0ff5056bf9f5dc3917
Author: Campbell Barton
Date: Sat Jul 14 15:59:47 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5a716701e8c769a9d24c5c0ff5056bf9f5dc3917
GPU_batch: fix error w/ interior line removal
Caused glitch w/ navigation icons showing inner lines.
===================================================================
M source/blender/gpu/intern/gpu_batch.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c
index 6194e720156..391a3812073 100644
--- a/source/blender/gpu/intern/gpu_batch.c
+++ b/source/blender/gpu/intern/gpu_batch.c
@@ -215,13 +215,12 @@ Gwn_Batch *GPU_batch_wire_from_poly_2d_encoded(
{
qsort(lines, lines_len, sizeof(int32_t), BLI_sortutil_cmp_int);
lines_step = lines;
-
- if (lines[0] != lines[1]) {
- *lines_step++ = lines[0];
- }
for (uint i_prev = 0, i = 1; i < lines_len; i_prev = i++) {
if (lines[i] != lines[i_prev]) {
- *lines_step++ = lines[i];
+ *lines_step++ = lines[i_prev];
+ }
+ else {
+ i++;
}
}
lines_len = lines_step - lines;
More information about the Bf-blender-cvs
mailing list