Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correct error in wrapped array-span-iteration

Browse Source
This commit is contained in:
Campbell Barton
2016-05-07 23:47:58 +10:00
parent f5930759a6
commit 6d402610c1
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenlib/intern/array_utils.c
View File

@@ -196,6 +196,9 @@ bool _bli_array_iter_span(
if (arr_len == 0) { if (arr_len == 0) {
return false; return false;
} }
else if (use_wrap && (span_step[0] != arr_len) && (span_step[0] > span_step[1])) {
return false;
}
const unsigned int arr_stride_uint = (unsigned int)arr_stride; const unsigned int arr_stride_uint = (unsigned int)arr_stride;
const void *item_prev; const void *item_prev;
@@ -252,7 +255,12 @@ bool _bli_array_iter_span(
} }
} }
span_len = (i_step_prev - ((i_step_prev >= i_curr) ? i_curr : (i_curr + arr_len))) + 1; if (i_step_prev < i_curr) {
span_len = (i_step_prev + (arr_len - i_curr)) + 1;
}
else {
span_len = (i_step_prev - i_curr) + 1;
}
} }
else { else {
unsigned int i_step = i_curr + 1; unsigned int i_step = i_curr + 1;