From 4c4c7724966e779e5879a721c1f663088c775c3f Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sun, 5 Oct 2014 23:10:44 +0200 Subject: Fix T41983: Array Modifier "Merge" bug? We messed up previous fix, in 'simplified' translated merge case... :( --- source/blender/modifiers/intern/MOD_array.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 4dbe28e8a59..40db49afef2 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; } } -- cgit v1.2.3