diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-10-13 23:02:30 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-10-13 23:02:30 +0400 |
commit | 3b805af8af82d473bbcdd7809c43374995e005e6 (patch) | |
tree | caab63f6e3d5e5b6e1e9e98c87616683bf2e2a59 /source/blender/gpu | |
parent | e3d8c8eba855b0c97d71b83b33c93f99f99c7941 (diff) |
Various warning fixes
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/gpu_buffers.h | 4 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/gpu/gpu_buffers.h b/source/blender/gpu/gpu_buffers.h index 20b502387da..662912f9c19 100644 --- a/source/blender/gpu/gpu_buffers.h +++ b/source/blender/gpu/gpu_buffers.h @@ -141,9 +141,9 @@ void *GPU_buffer_lock_stream( GPUBuffer *buffer ); void GPU_buffer_unlock( GPUBuffer *buffer ); /* upload three unsigned chars, representing RGB colors, for each vertex. Resets dm->drawObject->colType to -1 */ -void GPU_color3_upload( struct DerivedMesh *dm, char *data ); +void GPU_color3_upload( struct DerivedMesh *dm, unsigned char *data ); /* upload four unsigned chars, representing RGBA colors, for each vertex. Resets dm->drawObject->colType to -1 */ -void GPU_color4_upload( struct DerivedMesh *dm, char *data ); +void GPU_color4_upload( struct DerivedMesh *dm, unsigned char *data ); /* switch color rendering on=1/off=0 */ void GPU_color_switch( int mode ); diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index e750a3d05fd..2563f7977cc 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -1150,14 +1150,14 @@ void GPU_buffer_unbind() glBindBufferARB( GL_ARRAY_BUFFER_ARB, 0 ); } -void GPU_color3_upload( DerivedMesh *dm, char *data ) +void GPU_color3_upload( DerivedMesh *dm, unsigned char *data ) { if( dm->drawObject == 0 ) dm->drawObject = GPU_drawobject_new(dm); GPU_buffer_free(dm->drawObject->colors,globalPool); dm->drawObject->colors = GPU_buffer_setup( dm, dm->drawObject, sizeof(char)*3*dm->drawObject->nelements, GL_ARRAY_BUFFER_ARB, data, GPU_buffer_copy_color3 ); } -void GPU_color4_upload( DerivedMesh *dm, char *data ) +void GPU_color4_upload( DerivedMesh *dm, unsigned char *data ) { if( dm->drawObject == 0 ) dm->drawObject = GPU_drawobject_new(dm); |