archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T41983: Array Modifier "Merge" bug?

Browse Source 
We messed up previous fix, in 'simplified' translated merge case... :(
This commit is contained in:
Bastien Montagne
2014-10-05 23:10:44 +02:00
parent 6feac1e940
commit 1dd428ff6d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/modifiers/intern/MOD_array.c
View File

@@ -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;
}
}