Fix T41983: Array Modifier "Merge" bug?

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
Notes: blender-bot 2023-02-14 10:02:23 +01:00
Referenced by issue #42349, Windows Render command line Cycles Crash!
Referenced by issue #42165, blender not shutting down properly on win7.
Referenced by issue #41983, Array Modifier "Merge" bug?
1 changed files with 7 additions and 4 deletions

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