diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
commit | 386ba094988fc793f8e060d15438566e5e2d2cae (patch) | |
tree | 4cbde50b5d1d7a45c89ee99c29dd1b86d1d97b59 /source/blender/gpu/intern/gpu_element.c | |
parent | 6129e20cec4639aebf335ff13b2ba0c59670662d (diff) | |
parent | f97a64aa9b7b384f8221a1ef4f2eef9cde1238db (diff) |
Merge branch 'master' into temp-gpencil-drw-engine
Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c
Diffstat (limited to 'source/blender/gpu/intern/gpu_element.c')
-rw-r--r-- | source/blender/gpu/intern/gpu_element.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/gpu/intern/gpu_element.c b/source/blender/gpu/intern/gpu_element.c index 3f3f246d6d9..166a6236893 100644 --- a/source/blender/gpu/intern/gpu_element.c +++ b/source/blender/gpu/intern/gpu_element.c @@ -269,7 +269,7 @@ static uint index_range(const uint values[], uint value_len, uint *min_out, uint } uint min_value = RESTART_INDEX; uint max_value = 0; - for (uint i = 0; i < value_len; ++i) { + for (uint i = 0; i < value_len; i++) { const uint value = values[i]; if (value == RESTART_INDEX) { continue; @@ -307,13 +307,13 @@ static void squeeze_indices_short(GPUIndexBufBuilder *builder, if (max_index >= 0xFFFF) { elem->base_index = min_index; - for (uint i = 0; i < index_len; ++i) { + for (uint i = 0; i < index_len; i++) { data[i] = (values[i] == RESTART_INDEX) ? 0xFFFF : (GLushort)(values[i] - min_index); } } else { elem->base_index = 0; - for (uint i = 0; i < index_len; ++i) { + for (uint i = 0; i < index_len; i++) { data[i] = (GLushort)(values[i]); } } |