[Bf-blender-cvs] [ff238e3] temp-array-modifier: Cleanup: naming

[Campbell Barton]

Commit: ff238e3e668002368f14274ee3ec1e6a98480d85
Author: Campbell Barton
Date:   Tue Aug 12 11:03:02 2014 +1000
Branches: temp-array-modifier
https://developer.blender.org/rBff238e3e668002368f14274ee3ec1e6a98480d85

Cleanup: naming

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

M	source/blender/modifiers/intern/MOD_array.c

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

diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index 0a573d0..ae38c6f 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -173,7 +173,7 @@ typedef struct SortVertsElem {
 } SortVertsElem;
 
 
-static int vergaverco(const void *e1, const void *e2)
+static int svert_sum_cmp(const void *e1, const void *e2)
 {
 	const SortVertsElem *sv1 = (SortVertsElem *)e1;
 	const SortVertsElem *sv2 = (SortVertsElem *)e2;
@@ -198,7 +198,7 @@ static void svert_from_mvert(SortVertsElem *sv, MVert *mv, int i_begin, int i_en
  * It builds a mapping for all vertices within source, to vertices within target, or -1 if no double found
  * The int doubles_map[num_verts_source] array must have been allocated by caller.
 */
-static void map_doubles(
+static void dm_mvert_map_doubles(
         int *doubles_map,
         MVert *mverts,
         int target_start,
@@ -218,8 +218,8 @@ static void map_doubles(
 	source_end = source_start + source_num_verts;
 
 	/* build array of MVerts to be tested for merging */
-	sorted_verts_target = MEM_callocN(sizeof(SortVertsElem) * target_num_verts, "MOD array map doubles 1");
-	sorted_verts_source = MEM_callocN(sizeof(SortVertsElem) * source_num_verts, "MOD array map doubles 2");
+	sorted_verts_target = MEM_mallocN(sizeof(SortVertsElem) * target_num_verts, __func__);
+	sorted_verts_source = MEM_mallocN(sizeof(SortVertsElem) * source_num_verts, __func__);
 
 	/* Copy target vertices index and cos into SortVertsElem array */
 	svert_from_mvert(sorted_verts_target, mverts + target_start, target_start, target_end);
@@ -228,8 +228,8 @@ static void map_doubles(
 	svert_from_mvert(sorted_verts_source, mverts + source_start, source_start, source_end);
 
 	/* sort arrays according to sum of vertex coordinates (sumco) */
-	qsort(sorted_verts_target, target_num_verts, sizeof(SortVertsElem), vergaverco);
-	qsort(sorted_verts_source, source_num_verts, sizeof(SortVertsElem), vergaverco);
+	qsort(sorted_verts_target, target_num_verts, sizeof(SortVertsElem), svert_sum_cmp);
+	qsort(sorted_verts_source, source_num_verts, sizeof(SortVertsElem), svert_sum_cmp);
 
 	sve_target_low_bound = sorted_verts_target;
 	i_target_low_bound = 0;
@@ -581,14 +581,15 @@ static DerivedMesh *arrayModifier_doArray(
 				}
 			}
 			else {
-				map_doubles(full_doubles_map,
-				            result_dm_verts,
-				            (c - 1) * chunk_nverts,
-				            chunk_nverts,
-				            c * chunk_nverts,
-				            chunk_nverts,
-				            amd->merge_dist,
-				            false);
+				dm_mvert_map_doubles(
+				        full_doubles_map,
+				        result_dm_verts,
+				        (c - 1) * chunk_nverts,
+				        chunk_nverts,
+				        c * chunk_nverts,
+				        chunk_nverts,
+				        amd->merge_dist,
+				        false);
 			}
 		}
 	}
@@ -603,14 +604,15 @@ static DerivedMesh *arrayModifier_doArray(
 	    (count > 1))
 	{
 		/* Merge first and last copies */
-		map_doubles(full_doubles_map,
-		            result_dm_verts,
-		            last_chunk_start,
-		            last_chunk_nverts,
-		            first_chunk_start,
-		            first_chunk_nverts,
-		            amd->merge_dist,
-		            false);
+		dm_mvert_map_doubles(
+		        full_doubles_map,
+		        result_dm_verts,
+		        last_chunk_start,
+		        last_chunk_nverts,
+		        first_chunk_start,
+		        first_chunk_nverts,
+		        amd->merge_dist,
+		        false);
 	}
 
 	/* start capping */
@@ -626,14 +628,15 @@ static DerivedMesh *arrayModifier_doArray(
 		                      start_cap_nverts, start_cap_nedges, start_cap_nloops, start_cap_npolys);
 		/* Identify doubles with first chunk */
 		if (amd->flags & MOD_ARR_MERGE) {
-			map_doubles(full_doubles_map,
-			            result_dm_verts,
-			            first_chunk_start,
-			            first_chunk_nverts,
-			            start_cap_start,
-			            start_cap_nverts,
-			            amd->merge_dist,
-			            false);
+			dm_mvert_map_doubles(
+			        full_doubles_map,
+			        result_dm_verts,
+			        first_chunk_start,
+			        first_chunk_nverts,
+			        start_cap_start,
+			        start_cap_nverts,
+			        amd->merge_dist,
+			        false);
 		}
 	}
 
@@ -649,14 +652,15 @@ static DerivedMesh *arrayModifier_doArray(
 		                      end_cap_nverts, end_cap_nedges, end_cap_nloops, end_cap_npolys);
 		/* Identify doubles with last chunk */
 		if (amd->flags & MOD_ARR_MERGE) {
-			map_doubles(full_doubles_map,
-			            result_dm_verts,
-			            last_chunk_start,
-			            last_chunk_nverts,
-			            end_cap_start,
-			            end_cap_nverts,
-			            amd->merge_dist,
-			            false);
+			dm_mvert_map_doubles(
+			        full_doubles_map,
+			        result_dm_verts,
+			        last_chunk_start,
+			        last_chunk_nverts,
+			        end_cap_start,
+			        end_cap_nverts,
+			        amd->merge_dist,
+			        false);
 		}
 	}  /* Done capping */