[Bf-blender-cvs] [023b1a3] master: Cleanup: remove unused BVH_ONQUAD flag

Campbell Barton noreply at git.blender.org
Thu Aug 20 03:09:17 CEST 2015


Commit: 023b1a3843b22c42b1fc9c1725b081a31dc08a7a
Author: Campbell Barton
Date:   Thu Aug 20 11:03:34 2015 +1000
Branches: master
https://developer.blender.org/rB023b1a3843b22c42b1fc9c1725b081a31dc08a7a

Cleanup: remove unused BVH_ONQUAD flag

===================================================================

M	source/blender/blenkernel/intern/bvhutils.c
M	source/blender/blenlib/BLI_kdopbvh.h

===================================================================

diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
index 6131153..2ecae21 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -113,9 +113,6 @@ static void mesh_faces_nearest_point(void *userdata, int index, const float co[3
 			nearest->dist_sq = dist_sq;
 			copy_v3_v3(nearest->co, nearest_tmp);
 			normal_tri_v3(nearest->no, t0, t1, t2);
-
-			if (t1 == vert[face->v3].co)
-				nearest->flags |= BVH_ONQUAD;
 		}
 
 		t1 = t2;
@@ -202,9 +199,6 @@ static void mesh_faces_spherecast(void *userdata, int index, const BVHTreeRay *r
 			madd_v3_v3v3fl(hit->co, ray->origin, ray->direction, dist);
 
 			normal_tri_v3(hit->no, t0, t1, t2);
-
-			if (t1 == vert[face->v3].co)
-				hit->flags |= BVH_ONQUAD;
 		}
 
 		t1 = t2;
diff --git a/source/blender/blenlib/BLI_kdopbvh.h b/source/blender/blenlib/BLI_kdopbvh.h
index 4981b16..9f16b02 100644
--- a/source/blender/blenlib/BLI_kdopbvh.h
+++ b/source/blender/blenlib/BLI_kdopbvh.h
@@ -47,9 +47,6 @@ typedef struct BVHTreeOverlap {
 	int indexB;
 } BVHTreeOverlap;
 
-/* flags */
-#define BVH_ONQUAD (1 << 0)
-
 typedef struct BVHTreeNearest {
 	int index;          /* the index of the nearest found (untouched if none is found within a dist radius from the given coordinates) */
 	float co[3];        /* nearest coordinates (untouched it none is found within a dist radius from the given coordinates) */
@@ -69,7 +66,6 @@ typedef struct BVHTreeRayHit {
 	float co[3];        /* coordinates of the hit point */
 	float no[3];        /* normal on hit point */
 	float dist;         /* distance to the hit point */
-	int flags;
 } BVHTreeRayHit;
 
 /* callback must update nearest in case it finds a nearest result */




More information about the Bf-blender-cvs mailing list