[Bf-blender-cvs] [1ea5c2a] master: 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.

Antony Riakiotakis noreply at git.blender.org
Thu Jan 9 03:28:30 CET 2014


Commit: 1ea5c2a8e3518cf736e90394a1c10c1b31816f11
Author: Antony Riakiotakis
Date:   Thu Jan 9 04:28:17 2014 +0200
https://developer.blender.org/rB1ea5c2a8e3518cf736e90394a1c10c1b31816f11

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.

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

M	source/blender/blenkernel/intern/pbvh.c

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

diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 59bc9f9..76ac139 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




More information about the Bf-blender-cvs mailing list