[Bf-blender-cvs] [0f0d1ee] strand_gpu: Renamed BMesh strand functions to replace deprecated particle term 'keys' by 'vertex'.

[Lukas Tönne]

Commit: 0f0d1ee005def5ee6eb4fde89850a0494dac8748
Author: Lukas Tönne
Date:   Wed Jul 6 11:18:03 2016 +0200
Branches: strand_gpu
https://developer.blender.org/rB0f0d1ee005def5ee6eb4fde89850a0494dac8748

Renamed BMesh strand functions to replace deprecated particle term 'keys' by 'vertex'.

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

M	source/blender/bmesh/intern/bmesh_strands.c
M	source/blender/bmesh/intern/bmesh_strands.h
M	source/blender/bmesh/intern/bmesh_strands_conv.c
M	source/blender/physics/intern/strands.cpp

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

diff --git a/source/blender/bmesh/intern/bmesh_strands.c b/source/blender/bmesh/intern/bmesh_strands.c
index 8747771..cc58b27 100644
--- a/source/blender/bmesh/intern/bmesh_strands.c
+++ b/source/blender/bmesh/intern/bmesh_strands.c
@@ -103,7 +103,7 @@ int BM_strands_count(BMesh *bm)
 	return count;
 }
 
-int BM_strands_keys_count(BMVert *root)
+int BM_strand_verts_count(BMVert *root)
 {
 	BMVert *v;
 	BMIter iter;
@@ -116,13 +116,13 @@ int BM_strands_keys_count(BMVert *root)
 	return count;
 }
 
-int BM_strands_keys_count_max(BMesh *bm)
+int BM_strand_verts_count_max(BMesh *bm)
 {
 	BMVert *v;
 	BMIter iter;
 	int maxkeys = 0;
 	BM_ITER_STRANDS(v, &iter, bm, BM_STRANDS_OF_MESH) {
-		int n = BM_strands_keys_count(v);
+		int n = BM_strand_verts_count(v);
 		if (n > maxkeys)
 			maxkeys = n;
 	}
diff --git a/source/blender/bmesh/intern/bmesh_strands.h b/source/blender/bmesh/intern/bmesh_strands.h
index 1f060fa..c3db43f 100644
--- a/source/blender/bmesh/intern/bmesh_strands.h
+++ b/source/blender/bmesh/intern/bmesh_strands.h
@@ -110,8 +110,8 @@ BLI_INLINE BMVert *BM_strands_vert_prev(BMVert *v)
 }
 
 int BM_strands_count(BMesh *bm);
-int BM_strands_keys_count(BMVert *root);
-int BM_strands_keys_count_max(BMesh *bm);
+int BM_strand_verts_count(BMVert *root);
+int BM_strand_verts_count_max(BMesh *bm);
 
 /* Create a new strand */
 struct BMVert *BM_strands_create(struct BMesh *bm, int len, bool set_defaults);
diff --git a/source/blender/bmesh/intern/bmesh_strands_conv.c b/source/blender/bmesh/intern/bmesh_strands_conv.c
index e30765e..93c53f0 100644
--- a/source/blender/bmesh/intern/bmesh_strands_conv.c
+++ b/source/blender/bmesh/intern/bmesh_strands_conv.c
@@ -293,7 +293,7 @@ void BM_bm_from_strands(BMesh *bm, Strands *strands, struct DerivedMesh *root_dm
 static void make_strand_curve(BMesh *bm, BMVert *root, StrandVertex *verts, struct DerivedMesh *root_dm,
                               StrandCurve *curve, int verts_begin)
 {
-	int num_verts = BM_strands_keys_count(root);
+	int num_verts = BM_strand_verts_count(root);
 	
 	BMVert *v;
 	BMIter iter;
@@ -880,7 +880,7 @@ BLI_INLINE void bmesh_quick_edgedraw_flag(MEdge *med, BMEdge *e)
 
 static void make_particle_hair(BMesh *bm, BMVert *root, Object *ob, ParticleSystem *psys, struct DerivedMesh *emitter_dm, struct BVHTreeFromMesh *emitter_bvhtree, struct ParticleData *pa)
 {
-	int totkey = BM_strands_keys_count(root);
+	int totkey = BM_strand_verts_count(root);
 	HairKey *hair;
 	
 	BMVert *v;
diff --git a/source/blender/physics/intern/strands.cpp b/source/blender/physics/intern/strands.cpp
index 6d7c8e5..2ec8144 100644
--- a/source/blender/physics/intern/strands.cpp
+++ b/source/blender/physics/intern/strands.cpp
@@ -141,7 +141,7 @@ static void strands_adjust_segment_lengths(BMesh *bm)
 static void strands_solve_edge_relaxation(BMEditStrands *edit)
 {
 	BMesh *bm = edit->base.bm;
-	const int Nmax = BM_strands_keys_count_max(bm);
+	const int Nmax = BM_strand_verts_count_max(bm);
 	/* cache for vertex positions and segment lengths, for easier indexing */
 	float **co = (float **)MEM_mallocN(sizeof(float*) * Nmax, "strand positions");
 	float *target_length = (float *)MEM_mallocN(sizeof(float) * Nmax, "strand segment lengths");
@@ -150,7 +150,7 @@ static void strands_solve_edge_relaxation(BMEditStrands *edit)
 	BMIter iter;
 	BM_ITER_STRANDS(root, &iter, bm, BM_STRANDS_OF_MESH) {
 		const int S = 1; /* TODO particles use PE_LOCK_FIRST option */
-		const int N = BM_strands_keys_count(root);
+		const int N = BM_strand_verts_count(root);
 		const float divN = 1.0f / (float)N;
 		
 		/* setup positions cache */