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:
authorAntony Riakiotakis <kalast@gmail.com>2014-01-09 06:28:17 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-01-09 06:28:17 +0400
commit1ea5c2a8e3518cf736e90394a1c10c1b31816f11 (patch)
tree17023e6d4df12fafff536741761d048fe2d35f0e /source/blender/blenkernel/intern/pbvh.c
parente47a41e3fc5299c1416487972297e7de69472f1b (diff)
Fix remaining sculpt mode crash using multires modifier, similar cause
to previous sculpt fix (OpenGL access from thread with no context bound). The fact that this has gone unnoticed so far means that people are dyntopoing like crazy these days.
Diffstat (limited to 'source/blender/blenkernel/intern/pbvh.c')
-rw-r--r--source/blender/blenkernel/intern/pbvh.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 59bc9f9e57e..76ac13963a9 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -335,16 +335,6 @@ static void build_mesh_leaf_node(PBVH *bvh, PBVHNode *node)
BLI_ghash_free(map, NULL, NULL);
}
-static void build_grids_leaf_node(PBVH *bvh, PBVHNode *node)
-{
- if (!G.background) {
- node->draw_buffers =
- GPU_build_grid_pbvh_buffers(node->prim_indices,
- node->totprim, bvh->grid_hidden, bvh->gridkey.grid_size);
- }
- node->flag |= PBVH_UpdateDrawBuffers;
-}
-
static void update_vb(PBVH *bvh, PBVHNode *node, BBC *prim_bbc,
int offset, int count)
{
@@ -371,7 +361,7 @@ static void build_leaf(PBVH *bvh, int node_index, BBC *prim_bbc,
if (bvh->faces)
build_mesh_leaf_node(bvh, bvh->nodes + node_index);
else
- build_grids_leaf_node(bvh, bvh->nodes + node_index);
+ BKE_pbvh_node_mark_rebuild_draw(bvh->nodes + node_index);
}
/* Return zero if all primitives in the node can be drawn with the