Revision: 16380
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16380
Author: blendix
Date: 2008-09-05 15:00:34 +0200 (Fri, 05 Sep 2008)
Log Message:
-----------
Fix for syntax error in this file, caused by previous commit.
Also some warning fixes.
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
12:06:47 UTC (rev 16379)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2008-09-05
13:00:34 UTC (rev 16380)
@@ -482,7 +482,7 @@
{
int i;
for(i=0; i<depth; i++) printf(" ");
- printf(" - %d (%d): ", node->index, node - tree->nodearray);
+ printf(" - %d (%ld): ", node->index, node - tree->nodearray);
for(i=2*tree->start_axis; i<2*tree->stop_axis; i++)
printf("%.3f ", node->bv[i]);
printf("\n");
@@ -497,10 +497,10 @@
printf("BVHTree info\n");
printf("tree_type = %d, axis = %d, epsilon = %f\n", tree->tree_type,
tree->axis, tree->epsilon);
printf("nodes = %d, branches = %d, leafs = %d\n", tree->totbranch +
tree->totleaf, tree->totbranch, tree->totleaf);
- printf("Memory per node = %dbytes\n", sizeof(BVHNode) +
sizeof(BVHNode*)*tree->tree_type + sizeof(float)*tree->axis);
+ printf("Memory per node = %ldbytes\n", sizeof(BVHNode) +
sizeof(BVHNode*)*tree->tree_type + sizeof(float)*tree->axis);
printf("BV memory = %dbytes\n", MEM_allocN_len(tree->nodebv));
- printf("Total memory = %dbytes\n", sizeof(BVHTree)
+ printf("Total memory = %ldbytes\n", sizeof(BVHTree)
+ MEM_allocN_len(tree->nodes)
+ MEM_allocN_len(tree->nodearray)
+ MEM_allocN_len(tree->nodechild)
@@ -1108,7 +1108,7 @@
BVHOverlapData **data;
// check for compatibility of both trees (can't compare 14-DOP with
18-DOP)
- if((tree1->axis != tree2->axis) && ((tree1->axis == 14) || tree2->axis
== 14) && (tree1->axis == 18) || tree2->axis == 18))
+ if((tree1->axis != tree2->axis) && (tree1->axis == 14 || tree2->axis ==
14) && (tree1->axis == 18 || tree2->axis == 18))
return 0;
// fast check root nodes for collision before doing big splitting +
traversal
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
