forked from bartvdbraak/blender
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.
This commit is contained in:
parent
3c38830013
commit
a6dc47b0ca
@ -420,11 +420,10 @@ static void build_mesh_leaf_node(PBVH *bvh, PBVHNode *node)
|
||||
|
||||
if(!G.background) {
|
||||
node->draw_buffers =
|
||||
GPU_build_mesh_buffers(map, bvh->verts, bvh->faces,
|
||||
GPU_build_mesh_buffers(map, bvh->faces,
|
||||
node->prim_indices,
|
||||
node->totprim, node->vert_indices,
|
||||
node->uniq_verts,
|
||||
node->uniq_verts + node->face_verts);
|
||||
node->totprim,
|
||||
node->uniq_verts);
|
||||
}
|
||||
|
||||
node->flag |= PBVH_UpdateDrawBuffers;
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
GPU_Buffers *GPU_build_mesh_buffers(GHash *map, MFace *mface,
|
||||
int *face_indices, int totface,
|
||||
int *vert_indices, int tot_uniq_verts,
|
||||
int totvert)
|
||||
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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user