[Bf-blender-cvs] [43bf4a0] temp_display_optimization: Bah, merge change that was left uncommitted

Antony Riakiotakis noreply at git.blender.org
Sun Jul 12 16:41:31 CEST 2015


Commit: 43bf4a0f511bcc479112690261e82230b2e012a1
Author: Antony Riakiotakis
Date:   Sun Jul 12 16:40:47 2015 +0200
Branches: temp_display_optimization
https://developer.blender.org/rB43bf4a0f511bcc479112690261e82230b2e012a1

Bah, merge change that was left uncommitted

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

M	source/blender/gpu/intern/gpu_buffers.c

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

diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index 7c31ffd..73c80b9 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -465,10 +465,6 @@ static GPUBuffer *gpu_try_realloc(GPUBufferPool *pool, GPUBuffer *buffer, int si
 	return buffer;
 }
 
-typedef void (*GPUBufferCopyFunc)(
-        DerivedMesh *dm, float *varray, int *index,
-        const int *mat_orig_to_new, const void *user_data);
-
 static GPUBuffer *gpu_buffer_setup(DerivedMesh *dm, GPUDrawObject *object,
                                    int type, void *user)
 {




More information about the Bf-blender-cvs mailing list