[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44342] trunk/blender/source/blender/ blenlib: Code cleanup: remove unused 'skip' field from PBVH iterator.

Nicholas Bishop nicholasbishop at gmail.com
Wed Feb 22 23:41:09 CET 2012


Revision: 44342
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44342
Author:   nicholasbishop
Date:     2012-02-22 22:41:08 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
Code cleanup: remove unused 'skip' field from PBVH iterator.

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

Modified: trunk/blender/source/blender/blenlib/BLI_pbvh.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_pbvh.h	2012-02-22 22:37:01 UTC (rev 44341)
+++ trunk/blender/source/blender/blenlib/BLI_pbvh.h	2012-02-22 22:41:08 UTC (rev 44342)
@@ -142,7 +142,6 @@
 	int g;
 	int width;
 	int height;
-	int skip;
 	int gx;
 	int gy;
 	int i;
@@ -182,13 +181,6 @@
 			vi.width= vi.gridsize; \
 			vi.height= vi.gridsize; \
 			vi.grid= vi.grids[vi.grid_indices[vi.g]]; \
-			vi.skip= 0; \
-			 \
-			/*if(mode == PVBH_ITER_UNIQUE) { \
-				vi.grid += subm->grid.offset; \
-				vi.skip= subm->grid.skip; \
-				vi.grid -= skip; \
-			}*/ \
 		} \
 		else { \
 			vi.width= vi.totvert; \
@@ -196,8 +188,6 @@
 		} \
 		 \
 		for(vi.gy=0; vi.gy<vi.height; vi.gy++) { \
-			if(vi.grid) vi.grid += vi.skip; \
-			\
 			for(vi.gx=0; vi.gx<vi.width; vi.gx++, vi.i++) { \
 				if(vi.grid) { \
 					vi.co= vi.grid->co; \

Modified: trunk/blender/source/blender/blenlib/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/pbvh.c	2012-02-22 22:37:01 UTC (rev 44341)
+++ trunk/blender/source/blender/blenlib/intern/pbvh.c	2012-02-22 22:41:08 UTC (rev 44342)
@@ -1696,7 +1696,6 @@
 	vi->no= 0;
 	vi->fno= 0;
 	vi->mvert= 0;
-	vi->skip= 0;
 	
 	BLI_pbvh_node_get_grids(bvh, node, &grid_indices, &totgrid, NULL, &gridsize, &grids, NULL);
 	BLI_pbvh_node_num_verts(bvh, node, &uniq_verts, &totvert);




More information about the Bf-blender-cvs mailing list