From 70bb61ba97c45eae4864d348f3f67da7d13eb0ba Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Mon, 27 May 2019 08:30:53 -0600 Subject: [PATCH] Cleanup: Fix warnings in gpu_batch Passing a const pointer to MEM_freeN/MEM_recallocN lead to C4090 'function': different 'const' qualifiers warnings with MSVC --- source/blender/gpu/intern/gpu_batch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c index 09c29cc1654..d1cfd5c337d 100644 --- a/source/blender/gpu/intern/gpu_batch.c +++ b/source/blender/gpu/intern/gpu_batch.c @@ -56,7 +56,7 @@ void GPU_batch_vao_cache_clear(GPUBatch *batch) (GPUShaderInterface *)batch->dynamic_vaos.interfaces[i], batch); } } - MEM_freeN(batch->dynamic_vaos.interfaces); + MEM_freeN((void *)batch->dynamic_vaos.interfaces); MEM_freeN(batch->dynamic_vaos.vao_ids); } else { @@ -285,7 +285,7 @@ static GLuint batch_vao_get(GPUBatch *batch) /* Not enough place, realloc the array. */ i = batch->dynamic_vaos.count; batch->dynamic_vaos.count += GPU_BATCH_VAO_DYN_ALLOC_COUNT; - batch->dynamic_vaos.interfaces = MEM_recallocN(batch->dynamic_vaos.interfaces, + batch->dynamic_vaos.interfaces = MEM_recallocN((void *)batch->dynamic_vaos.interfaces, sizeof(GPUShaderInterface *) * batch->dynamic_vaos.count); batch->dynamic_vaos.vao_ids = MEM_recallocN(batch->dynamic_vaos.vao_ids,