[Bf-blender-cvs] [de0dd8c] temp-array-modifier: Fix for issue with orig-index not being set to NONE

[Campbell Barton]

Commit: de0dd8c26f06ed205a4d9c74d080735fb299ee94
Author: Campbell Barton
Date:   Tue Aug 12 12:27:11 2014 +1000
Branches: temp-array-modifier
https://developer.blender.org/rBde0dd8c26f06ed205a4d9c74d080735fb299ee94

Fix for issue with orig-index not being set to NONE

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

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 d433636..adc48b3 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -311,6 +311,7 @@ static void dm_merge_transform(
         unsigned int cap_verts_index, unsigned int cap_edges_index, int cap_loops_index, int cap_polys_index,
         int cap_nverts, int cap_nedges, int cap_nloops, int cap_npolys)
 {
+	int *index_orig;
 	int i;
 	MVert *mv;
 	MEdge *me;
@@ -355,6 +356,27 @@ static void dm_merge_transform(
 		ml->v += cap_verts_index;
 		ml->e += cap_edges_index;
 	}
+
+	/* set origindex */
+	index_orig = result_dm->getVertDataArray(result_dm, CD_ORIGINDEX);
+	if (index_orig) {
+		fill_vn_i(index_orig + cap_verts_index, cap_nverts, ORIGINDEX_NONE);
+	}
+
+	index_orig = result_dm->getEdgeDataArray(result_dm, CD_ORIGINDEX);
+	if (index_orig) {
+		fill_vn_i(index_orig + cap_edges_index, cap_nedges, ORIGINDEX_NONE);
+	}
+
+	index_orig = result_dm->getPolyDataArray(result_dm, CD_ORIGINDEX);
+	if (index_orig) {
+		fill_vn_i(index_orig + cap_polys_index, cap_npolys, ORIGINDEX_NONE);
+	}
+
+	index_orig = result_dm->getLoopDataArray(result_dm, CD_ORIGINDEX);
+	if (index_orig) {
+		fill_vn_i(index_orig + cap_loops_index, cap_nloops, ORIGINDEX_NONE);
+	}
 }
 
 static DerivedMesh *arrayModifier_doArray(