[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16378] trunk/blender/source/blender/ blenlib/intern/BLI_kdopbvh.c: forgot to delete some function
Daniel Genrich
daniel.genrich at gmx.net
Fri Sep 5 14:03:32 CEST 2008
Revision: 16378
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16378
Author: genscher
Date: 2008-09-05 14:03:32 +0200 (Fri, 05 Sep 2008)
Log Message:
-----------
forgot to delete some function
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2008-09-05 11:55:39 UTC (rev 16377)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2008-09-05 12:03:32 UTC (rev 16378)
@@ -1101,66 +1101,6 @@
return;
}
-// general function for traversing the tree
-void BLI_bvhtree_traverse(BVHOverlapData *data, BVHNode *node1, BVHNode *node2)
-{
- int j;
-
- if(tree_overlap(node1, node2, data->start_axis, data->stop_axis))
- {
- // check if node1 is a leaf
- if(!node1->totnode)
- {
- // check if node2 is a leaf
- if(!node2->totnode)
- {
-
- if(node1 == node2)
- {
- return;
- }
-
- if(data->i >= data->max_overlap)
- {
- // try to make alloc'ed memory bigger
- data->overlap = realloc(data->overlap, sizeof(BVHTreeOverlap)*data->max_overlap*2);
-
- if(!data->overlap)
- {
- printf("Out of Memory in traverse\n");
- return;
- }
- data->max_overlap *= 2;
- }
-
- // both leafs, insert overlap!
- data->overlap[data->i].indexA = node1->index;
- data->overlap[data->i].indexB = node2->index;
-
- data->i++;
- }
- else
- {
- for(j = 0; j < data->tree2->tree_type; j++)
- {
- if(node2->children[j])
- traverse(data, node1, node2->children[j]);
- }
- }
- }
- else
- {
-
- for(j = 0; j < data->tree2->tree_type; j++)
- {
- if(node1->children[j])
- traverse(data, node1->children[j], node2);
- }
- }
- }
- return;
-}
-
BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, int *result)
{
int j, total = 0;
More information about the Bf-blender-cvs
mailing list