[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37211] branches/soc-2011-onion/source/ blender/blenlib/intern/pbvh.c: unused variables in bli/pbvh.c

[Jason Wilkins]

Revision: 37211
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37211
Author:   jwilkins
Date:     2011-06-05 14:33:15 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
unused variables in bli/pbvh.c

I'm confused why this conflict only appeared when merging onion into salad but not when merging trunk into onion.

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/blenlib/intern/pbvh.c

Modified: branches/soc-2011-onion/source/blender/blenlib/intern/pbvh.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenlib/intern/pbvh.c	2011-06-05 14:00:06 UTC (rev 37210)
+++ branches/soc-2011-onion/source/blender/blenlib/intern/pbvh.c	2011-06-05 14:33:15 UTC (rev 37211)
@@ -179,17 +179,17 @@
 static int pbvh_planes_contain_AABB(float bb_min[3], float bb_max[3], float (*planes)[4])
 {
 	int i, axis;
-	float vmin[3], vmax[3];
+	float vmin[3]/*, vmax[3]*/;
 
 	for(i = 0; i < 4; ++i) { 
 		for(axis = 0; axis < 3; ++axis) {
 			if(planes[i][axis] > 0) { 
 				vmin[axis] = bb_min[axis];
-				vmax[axis] = bb_max[axis];
+				/*vmax[axis] = bb_max[axis];*/ /*UNUSED*/
 			}
 			else {
 				vmin[axis] = bb_max[axis];
-				vmax[axis] = bb_min[axis];
+				/*vmax[axis] = bb_min[axis];*/ /*UNUSED*/
 			}
 		}
 		
@@ -812,7 +812,7 @@
 		node= iter->stack[iter->stacksize].node;
 
 		/* on a mesh with no faces this can happen
-		* can remove this check if we know meshes have at least 1 face */
+		 * can remove this check if we know meshes have at least 1 face */
 		if(node==NULL) return NULL;
 
 		if(iter->scb && !iter->scb(node, iter->search_data)) continue; /* don't traverse, outside of search zone */
@@ -1128,19 +1128,19 @@
 		if(node->flag & PBVH_UpdateVertBuffers) {
 			if(bvh->grids) {
 				GPU_update_grid_vert_buffers(node->draw_buffers,
-							     bvh->grids,
-							     node->prim_indices,
-							     node->totprim,
-							     bvh->gridsize,
+						   bvh->grids,
+						   node->prim_indices,
+						   node->totprim,
+						   bvh->gridsize,
 							     bvh->gridkey,
-							     smooth);
+						   smooth);
 			}
 			else {
 				GPU_update_mesh_vert_buffers(node->draw_buffers,
-							     bvh->verts,
-							     node->vert_indices,
-							     node->uniq_verts +
-							     node->face_verts);
+						   bvh->verts,
+						   node->vert_indices,
+						   node->uniq_verts +
+						   node->face_verts);
 			}
 
 			node->flag &= ~PBVH_UpdateVertBuffers;
@@ -1155,14 +1155,14 @@
 							      bvh->gridsize,
 							      bvh->gridkey,
 							      bvh->vdata);
-			}
+	}
 			else {
 				GPU_update_mesh_color_buffers(node->draw_buffers,
 							      bvh->vdata,
 							      node->vert_indices,
 							      node->uniq_verts +
 							      node->face_verts);
-			}
+}
 
 			node->flag &= ~PBVH_UpdateColorBuffers;
 		}
@@ -1461,7 +1461,7 @@
 	float dist;
 
 	if ((isect_ray_tri_epsilon_v3(ray_start, ray_normal, t0, t1, t2, &dist, NULL, 0.1f) && dist < *fdist) ||
-		(t3 && isect_ray_tri_epsilon_v3(ray_start, ray_normal, t0, t2, t3, &dist, NULL, 0.1f) && dist < *fdist))
+	   (t3 && isect_ray_tri_epsilon_v3(ray_start, ray_normal, t0, t2, t3, &dist, NULL, 0.1f) && dist < *fdist))
 	{
 		*fdist = dist;
 		return 1;