[Bf-blender-cvs] [063ebd5836a] master: Cleanup: Fix warnings in bf_gpu

Ray Molenkamp noreply at git.blender.org
Mon May 27 16:22:43 CEST 2019


Commit: 063ebd5836a8fcd8100c266f9314158a4e2b1608
Author: Ray Molenkamp
Date:   Mon May 27 08:22:38 2019 -0600
Branches: master
https://developer.blender.org/rB063ebd5836a8fcd8100c266f9314158a4e2b1608

Cleanup: Fix warnings in bf_gpu

Declaration and implementation got out of sync leading to warnings.

===================================================================

M	source/blender/gpu/GPU_batch.h

===================================================================

diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h
index 3b0d72831c0..5b0cab220c0 100644
--- a/source/blender/gpu/GPU_batch.h
+++ b/source/blender/gpu/GPU_batch.h
@@ -142,8 +142,8 @@ void GPU_batch_uniform_4f(GPUBatch *, const char *name, float x, float y, float
 void GPU_batch_uniform_2fv(GPUBatch *, const char *name, const float data[2]);
 void GPU_batch_uniform_3fv(GPUBatch *, const char *name, const float data[3]);
 void GPU_batch_uniform_4fv(GPUBatch *, const char *name, const float data[4]);
-void GPU_batch_uniform_2fv_array(GPUBatch *, const char *name, int len, const float *data);
-void GPU_batch_uniform_4fv_array(GPUBatch *, const char *name, int len, const float *data);
+void GPU_batch_uniform_2fv_array(GPUBatch *, const char *name, const int len, const float *data);
+void GPU_batch_uniform_4fv_array(GPUBatch *, const char *name, const int len, const float *data);
 void GPU_batch_uniform_mat4(GPUBatch *, const char *name, const float data[4][4]);
 
 void GPU_batch_draw(GPUBatch *);



More information about the Bf-blender-cvs mailing list