diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-06 01:27:28 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-06 01:27:28 +0400 |
| commit | e2003f9a6c0ad1f2b03821f2c8aaa91565c51c40 (patch) | |
| tree | e08672eb63a8e31d977b79a88f8d6d48624533ab /source/blender/gpu | |
| parent | bd83487dab6e4be5facf9fefb476a4273c64e1df (diff) | |
Code cleanup: remove unused drawFacesColored from DerivedMesh.
This function pointer isn't called anymore, so removing it and the
cddm/ccgdm/gpu code associated with it.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/GPU_buffers.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 12 |
2 files changed, 0 insertions, 14 deletions
diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h index b3a317364a9..b89219c2d56 100644 --- a/source/blender/gpu/GPU_buffers.h +++ b/source/blender/gpu/GPU_buffers.h @@ -142,8 +142,6 @@ 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, 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, 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 00e34b41faf..6e7ec98e65b 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -1170,18 +1170,6 @@ void GPU_color3_upload(DerivedMesh *dm, unsigned char *data) GL_ARRAY_BUFFER_ARB, data, GPU_buffer_copy_color3); } -/* this is used only in cdDM_drawFacesColored, which I think is no - longer used, so can probably remove this --nicholas */ -void GPU_color4_upload(DerivedMesh *UNUSED(dm), unsigned char *UNUSED(data)) -{ - /*if(dm->drawObject == 0) - dm->drawObject = GPU_drawobject_new(dm); - GPU_buffer_free(dm->drawObject->colors); - dm->drawObject->colors = gpu_buffer_setup(dm, dm->drawObject, 3, - sizeof(char)*3*dm->drawObject->tot_triangle_point, - GL_ARRAY_BUFFER_ARB, data, GPU_buffer_copy_color4);*/ -} - void GPU_color_switch(int mode) { if(mode) { |