Commit: 1dd428ff6d45194fcabe1bdff62ede08f531a4ea
Author: Bastien Montagne
Date: Sun Oct 5 23:10:44 2014 +0200
Branches: master
https://developer.blender.org/rB1dd428ff6d45194fcabe1bdff62ede08f531a4ea
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;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
