diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-01-03 00:22:36 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-01-03 14:48:12 +0400 |
| commit | ba8d65a9a7a0fbcf49dbfcd15625a75062f6d302 (patch) | |
| tree | ce1885a83323ab1f0333419fe08177863ec2554b /source/blender/blenkernel/intern/pbvh.c | |
| parent | c5cb42f40285fca072e8378bdadf11c674b90340 (diff) | |
Code clean-up change naming of gpu buffers used by pbvh to better
reflect that. Previous name GPU_Buffers was very similar to GPU_Buffer,
renamed to GPU_PBVH_Buffers
Diffstat (limited to 'source/blender/blenkernel/intern/pbvh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 27e52614a40..90447db5113 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -332,7 +332,7 @@ static void build_mesh_leaf_node(PBVH *bvh, PBVHNode *node) if (!G.background) { node->draw_buffers = - GPU_build_mesh_buffers(node->face_vert_indices, + GPU_build_pbvh_mesh_buffers(node->face_vert_indices, bvh->faces, bvh->verts, node->prim_indices, node->totprim); @@ -347,7 +347,7 @@ static void build_grids_leaf_node(PBVH *bvh, PBVHNode *node) { if (!G.background) { node->draw_buffers = - GPU_build_grid_buffers(node->prim_indices, + GPU_build_grid_pbvh_buffers(node->prim_indices, node->totprim, bvh->grid_hidden, bvh->gridkey.grid_size); } node->flag |= PBVH_UpdateDrawBuffers; @@ -604,7 +604,7 @@ void BKE_pbvh_free(PBVH *bvh) if (node->flag & PBVH_Leaf) { if (node->draw_buffers) - GPU_free_buffers(node->draw_buffers); + GPU_free_pbvh_buffers(node->draw_buffers); if (node->vert_indices) MEM_freeN(node->vert_indices); if (node->face_vert_indices) @@ -1043,25 +1043,25 @@ static void pbvh_update_draw_buffers(PBVH *bvh, PBVHNode **nodes, int totnode) node = nodes[n]; if (node->flag & PBVH_RebuildDrawBuffers) { - GPU_free_buffers(node->draw_buffers); + GPU_free_pbvh_buffers(node->draw_buffers); switch (bvh->type) { case PBVH_GRIDS: node->draw_buffers = - GPU_build_grid_buffers(node->prim_indices, + GPU_build_grid_pbvh_buffers(node->prim_indices, node->totprim, bvh->grid_hidden, bvh->gridkey.grid_size); break; case PBVH_FACES: node->draw_buffers = - GPU_build_mesh_buffers(node->face_vert_indices, + GPU_build_pbvh_mesh_buffers(node->face_vert_indices, bvh->faces, bvh->verts, node->prim_indices, node->totprim); break; case PBVH_BMESH: node->draw_buffers = - GPU_build_bmesh_buffers(bvh->flags & + GPU_build_bmesh_pbvh_buffers(bvh->flags & PBVH_DYNTOPO_SMOOTH_SHADING); break; } @@ -1072,7 +1072,7 @@ static void pbvh_update_draw_buffers(PBVH *bvh, PBVHNode **nodes, int totnode) if (node->flag & PBVH_UpdateDrawBuffers) { switch (bvh->type) { case PBVH_GRIDS: - GPU_update_grid_buffers(node->draw_buffers, + GPU_update_grid_pbvh_buffers(node->draw_buffers, bvh->grids, bvh->grid_flag_mats, node->prim_indices, @@ -1081,7 +1081,7 @@ static void pbvh_update_draw_buffers(PBVH *bvh, PBVHNode **nodes, int totnode) bvh->show_diffuse_color); break; case PBVH_FACES: - GPU_update_mesh_buffers(node->draw_buffers, + GPU_update_mesh_pbvh_buffers(node->draw_buffers, bvh->verts, node->vert_indices, node->uniq_verts + @@ -1092,7 +1092,7 @@ static void pbvh_update_draw_buffers(PBVH *bvh, PBVHNode **nodes, int totnode) bvh->show_diffuse_color); break; case PBVH_BMESH: - GPU_update_bmesh_buffers(node->draw_buffers, + GPU_update_bmesh_pbvh_buffers(node->draw_buffers, bvh->bm, node->bm_faces, node->bm_unique_verts, @@ -1613,7 +1613,7 @@ void BKE_pbvh_node_draw(PBVHNode *node, void *data_v) #endif if (!(node->flag & PBVH_FullyHidden)) { - GPU_draw_buffers(node->draw_buffers, + GPU_draw_pbvh_buffers(node->draw_buffers, data->setMaterial, data->wireframe); } @@ -1680,7 +1680,7 @@ static void pbvh_node_check_diffuse_changed(PBVH *bvh, PBVHNode *node) if (!node->draw_buffers) return; - if (GPU_buffers_diffuse_changed(node->draw_buffers, bvh->show_diffuse_color)) + if (GPU_pbvh_buffers_diffuse_changed(node->draw_buffers, bvh->show_diffuse_color)) node->flag |= PBVH_UpdateDrawBuffers; } |