[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53454] trunk/blender/source/blender: rename BM_edge_calc_squared_length -> BM_edge_calc_length_squared, matching len_v3, len_squared_v3

Campbell Barton ideasman42 at gmail.com
Mon Dec 31 03:40:20 CET 2012


Revision: 53454
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53454
Author:   campbellbarton
Date:     2012-12-31 02:40:15 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
rename BM_edge_calc_squared_length -> BM_edge_calc_length_squared, matching len_v3, len_squared_v3

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
    trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
    trunk/blender/source/blender/bmesh/intern/bmesh_queries.h

Modified: trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c	2012-12-31 02:37:28 UTC (rev 53453)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c	2012-12-31 02:40:15 UTC (rev 53454)
@@ -532,7 +532,7 @@
 static void long_edge_queue_edge_add(EdgeQueue *q, BLI_mempool *pool,
 									 BMEdge *e)
 {
-	const float len_sq = BM_edge_calc_squared_length(e);
+	const float len_sq = BM_edge_calc_length_squared(e);
 	if (len_sq > q->limit_len_squared)
 		edge_queue_insert(q, pool, e, 1.0f / len_sq);
 }
@@ -540,7 +540,7 @@
 static void short_edge_queue_edge_add(EdgeQueue *q, BLI_mempool *pool,
 									  BMEdge *e)
 {
-	const float len_sq = BM_edge_calc_squared_length(e);
+	const float len_sq = BM_edge_calc_length_squared(e);
 	if (len_sq < q->limit_len_squared)
 		edge_queue_insert(q, pool, e, len_sq);
 }
@@ -762,7 +762,7 @@
 			continue;
 		}
 
-		if (BM_edge_calc_squared_length(e) <= q->limit_len_squared)
+		if (BM_edge_calc_length_squared(e) <= q->limit_len_squared)
 			continue;
 
 		any_subdivided = TRUE;
@@ -925,7 +925,7 @@
 			continue;
 		}
 
-		if (BM_edge_calc_squared_length(e) >= min_len_squared)
+		if (BM_edge_calc_length_squared(e) >= min_len_squared)
 			continue;
 
 		any_collapsed = TRUE;

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2012-12-31 02:37:28 UTC (rev 53453)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2012-12-31 02:40:15 UTC (rev 53454)
@@ -478,7 +478,7 @@
 /**
  * Returns edge length squared (for comparisons)
  */
-float BM_edge_calc_squared_length(BMEdge *e)
+float BM_edge_calc_length_squared(BMEdge *e)
 {
 	return len_squared_v3v3(e->v1->co, e->v2->co);
 }

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.h	2012-12-31 02:37:28 UTC (rev 53453)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.h	2012-12-31 02:40:15 UTC (rev 53454)
@@ -37,7 +37,7 @@
 int     BM_verts_in_edge(BMVert *v1, BMVert *v2, BMEdge *e);
 
 float   BM_edge_calc_length(BMEdge *e);
-float   BM_edge_calc_squared_length(BMEdge *e);
+float   BM_edge_calc_length_squared(BMEdge *e);
 int     BM_edge_face_pair(BMEdge *e, BMFace **r_fa, BMFace **r_fb);
 int     BM_edge_loop_pair(BMEdge *e, BMLoop **r_la, BMLoop **r_lb);
 BMVert *BM_edge_other_vert(BMEdge *e, BMVert *v);




More information about the Bf-blender-cvs mailing list