Revision: 14964
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14964
Author: jaguarandi
Date: 2008-05-25 17:47:54 +0200 (Sun, 25 May 2008)
Log Message:
-----------
Merge BVH tree fixes from cloth branch
svn merge -r 14954:14963
https://svn.blender.org/svnroot/bf-blender/branches/cloth/blender/source/blender/blenlib/BLI_kdopbvh.h
svn merge -r 14954:14963
https://svn.blender.org/svnroot/bf-blender/branches/cloth/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
Modified Paths:
--------------
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_kdopbvh.c
Modified:
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_kdopbvh.c
2008-05-25 15:43:18 UTC (rev 14963)
+++ branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_kdopbvh.c
2008-05-25 15:47:54 UTC (rev 14964)
@@ -741,7 +741,7 @@
if(!tree_overlap(tree1->nodes[tree1->totleaf],
tree2->nodes[tree2->totleaf], MIN2(tree1->start_axis, tree2->start_axis),
MIN2(tree1->stop_axis, tree2->stop_axis)))
return 0;
- *data = MEM_callocN(sizeof(BVHOverlapData *)* tree1->tree_type,
"BVHOverlapData_star");
+ data = MEM_callocN(sizeof(BVHOverlapData *)* tree1->tree_type,
"BVHOverlapData_star");
for(j = 0; j < tree1->tree_type; j++)
{
@@ -777,7 +777,7 @@
free(data[j]->overlap);
MEM_freeN(data[j]);
}
- MEM_freeN(*data);
+ MEM_freeN(data);
(*result) = total;
return overlap;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
