[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16379] trunk/blender/source/blender/ blenlib/intern/BLI_kdopbvh.c: Fixing non-working check for incompatible trees

[Daniel Genrich]

Revision: 16379
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16379
Author:   genscher
Date:     2008-09-05 14:06:47 +0200 (Fri, 05 Sep 2008)

Log Message:
-----------
Fixing non-working check for incompatible trees

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:03:32 UTC (rev 16378)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c	2008-09-05 12:06:47 UTC (rev 16379)
@@ -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))
+	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