[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29850] trunk/blender/source/blender/ blenlib/intern/pbvh.c: Fix for crash with PBVH in background mode, patch by Campbell.

Brecht Van Lommel brecht at blender.org
Thu Jul 1 17:12:10 CEST 2010


Revision: 29850
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29850
Author:   blendix
Date:     2010-07-01 17:12:10 +0200 (Thu, 01 Jul 2010)

Log Message:
-----------
Fix for crash with PBVH in background mode, patch by Campbell.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/pbvh.c

Modified: trunk/blender/source/blender/blenlib/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/pbvh.c	2010-07-01 14:44:12 UTC (rev 29849)
+++ trunk/blender/source/blender/blenlib/intern/pbvh.c	2010-07-01 15:12:10 UTC (rev 29850)
@@ -30,6 +30,7 @@
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_mesh.h" /* for mesh_calc_normals */
+#include "BKE_global.h" /* for mesh_calc_normals */
 
 #include "gpu_buffers.h"
 
@@ -350,12 +351,14 @@
 		if(node->face_vert_indices[i] < 0)
 			node->face_vert_indices[i]= -node->face_vert_indices[i] + node->uniq_verts - 1;
 
-	node->draw_buffers =
-		GPU_build_mesh_buffers(map, bvh->verts, bvh->faces,
+	if(!G.background) {
+		node->draw_buffers =
+			GPU_build_mesh_buffers(map, bvh->verts, bvh->faces,
 				  node->prim_indices,
 				  node->totprim, node->vert_indices,
 				  node->uniq_verts,
 				  node->uniq_verts + node->face_verts);
+	}
 
 	node->flag |= PBVH_UpdateDrawBuffers;
 
@@ -364,10 +367,11 @@
 
 static void build_grids_leaf_node(PBVH *bvh, PBVHNode *node)
 {
-	node->draw_buffers =
-		GPU_build_grid_buffers(bvh->grids, node->prim_indices,
+	if(!G.background) {
+		node->draw_buffers =
+			GPU_build_grid_buffers(bvh->grids, node->prim_indices,
 				node->totprim, bvh->gridsize);
-
+	}
 	node->flag |= PBVH_UpdateDrawBuffers;
 }
 





More information about the Bf-blender-cvs mailing list