Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2012-02-21 08:16:27 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2012-02-21 08:16:27 +0400
commita6dc47b0cae6bde63dfb3ec77cdae2d77a3e8b26 (patch)
treecbf92042634713ee8c958a3a4691349e63cdc879 /source/blender/gpu
parent3c388300138bf565bfa404a3813c69ecbc289c1f (diff)
Remove call to GPU_update_mesh_buffers from GPU_build_mesh_buffers.
Building the mesh buffers already gets the PBVH_UpdateDrawBuffers flag set, so this was double-updating the vertex buffer.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/GPU_buffers.h5
-rw-r--r--source/blender/gpu/intern/gpu_buffers.c8
2 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h
index a72c79a1e62..945b9d819ef 100644
--- a/source/blender/gpu/GPU_buffers.h
+++ b/source/blender/gpu/GPU_buffers.h
@@ -159,10 +159,9 @@ int GPU_buffer_legacy( struct DerivedMesh *dm );
/* Buffers for non-DerivedMesh drawing */
typedef struct GPU_Buffers GPU_Buffers;
-GPU_Buffers *GPU_build_mesh_buffers(struct GHash *map, struct MVert *mvert,
+GPU_Buffers *GPU_build_mesh_buffers(struct GHash *map,
struct MFace *mface, int *face_indices,
- int totface, int *vert_indices, int uniq_verts,
- int totvert);
+ int totface, int uniq_verts);
void GPU_update_mesh_buffers(GPU_Buffers *buffers, struct MVert *mvert,
int *vert_indices, int totvert);
GPU_Buffers *GPU_build_grid_buffers(struct DMGridData **grids,
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index 8318d906f72..006baac0df5 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -1333,10 +1333,9 @@ void GPU_update_mesh_buffers(GPU_Buffers *buffers, MVert *mvert,
buffers->mvert = mvert;
}
-GPU_Buffers *GPU_build_mesh_buffers(GHash *map, MVert *mvert, MFace *mface,
- int *face_indices, int totface,
- int *vert_indices, int tot_uniq_verts,
- int totvert)
+GPU_Buffers *GPU_build_mesh_buffers(GHash *map, MFace *mface,
+ int *face_indices, int totface,
+ int tot_uniq_verts)
{
GPU_Buffers *buffers;
unsigned short *tri_data;
@@ -1402,7 +1401,6 @@ GPU_Buffers *GPU_build_mesh_buffers(GHash *map, MVert *mvert, MFace *mface,
if(buffers->index_buf)
glGenBuffersARB(1, &buffers->vert_buf);
- GPU_update_mesh_buffers(buffers, mvert, vert_indices, totvert);
buffers->tot_tri = tottri;