[Bf-blender-cvs] [4c4c772] blender-v2.72-release: Fix T41983: Array Modifier "Merge" bug?

[Bastien Montagne]

Commit: 4c4c7724966e779e5879a721c1f663088c775c3f
Author: Bastien Montagne
Date:   Sun Oct 5 23:10:44 2014 +0200
Branches: blender-v2.72-release
https://developer.blender.org/rB4c4c7724966e779e5879a721c1f663088c775c3f

Fix T41983: Array Modifier "Merge" bug?

We messed up previous fix, in 'simplified' translated merge case... :(

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

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 4dbe28e..40db49a 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -609,10 +609,13 @@ static DerivedMesh *arrayModifier_doArray(
 					int target = full_doubles_map[prev_chunk_index];
 					if (target != -1) {
 						target += chunk_nverts; /* translate mapping */
-						if (!with_follow) {
-							/* The rule here is to not follow mapping to chunk N-2, which could be too far
-							 * so if target vertex was itself mapped, then this vertex is not mapped */
-							if (full_doubles_map[target] != -1) {
+						if (full_doubles_map[target] != -1) {
+							if (with_follow) {
+								target = full_doubles_map[target];
+							}
+							else {
+								/* The rule here is to not follow mapping to chunk N-2, which could be too far
+								 * so if target vertex was itself mapped, then this vertex is not mapped */
 								target = -1;
 							}
 						}