[Bf-blender-cvs] [023b4a6] temp-array-modifier: Cleanup: use const

Campbell Barton noreply at git.blender.org
Tue Aug 12 04:14:15 CEST 2014


Commit: 023b4a6545f4e3798781f97a6dc6277cd4d79eae
Author: Campbell Barton
Date:   Tue Aug 12 11:29:16 2014 +1000
Branches: temp-array-modifier
https://developer.blender.org/rB023b4a6545f4e3798781f97a6dc6277cd4d79eae

Cleanup: use const

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

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 ae38c6f..660e33c 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -183,7 +183,7 @@ static int svert_sum_cmp(const void *e1, const void *e2)
 	else                                return  0;
 }
 
-static void svert_from_mvert(SortVertsElem *sv, MVert *mv, int i_begin, int i_end)
+static void svert_from_mvert(SortVertsElem *sv, const MVert *mv, const int i_begin, const int i_end)
 {
 	int i;
 	for (i = i_begin; i < i_end; i++, sv++, mv++) {
@@ -200,13 +200,13 @@ static void svert_from_mvert(SortVertsElem *sv, MVert *mv, int i_begin, int i_en
 */
 static void dm_mvert_map_doubles(
         int *doubles_map,
-        MVert *mverts,
-        int target_start,
-        int target_num_verts,
-        int source_start,
-        int source_num_verts,
-        float dist,
-        bool with_follow)
+        const MVert *mverts,
+        const int target_start,
+        const int target_num_verts,
+        const int source_start,
+        const int source_num_verts,
+        const float dist,
+        const bool with_follow)
 {
 	const float dist3 = (M_SQRT3 + 0.00005f) * dist;   /* Just above sqrt(3) */
 	int i_source, i_target, i_target_low_bound, target_end, source_end;
@@ -494,8 +494,7 @@ static DerivedMesh *arrayModifier_doArray(
 	if (amd->flags & MOD_ARR_MERGE) {
 		/* Will need full_doubles_map for handling merge */
 		full_doubles_map = MEM_mallocN(sizeof(int) * result_nverts, "mod array doubles map");
-		for (i = 0; i < result_nverts; i++)
-			full_doubles_map[i] = -1;
+		fill_vn_i(full_doubles_map, result_nverts, -1);
 	}
 
 	/* copy customdata to original geometry */




More information about the Bf-blender-cvs mailing list