Revision: 14500
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14500
Author: blendix
Date: 2008-04-21 11:24:04 +0200 (Mon, 21 Apr 2008)
Log Message:
-----------
Fix for bug #9093: array modifier merging didn't work
entirely correct after a recent bugfix.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/modifier.c
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2008-04-21
09:13:56 UTC (rev 14499)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2008-04-21
09:24:04 UTC (rev 14500)
@@ -844,6 +844,11 @@
mvert = CDDM_get_verts(result);
for (i = 0; i < maxVerts; i++) {
+ indexMap[i].merge = -1; /* default to no merge */
+ indexMap[i].merge_final = 0; /* default to no merge */
+ }
+
+ for (i = 0; i < maxVerts; i++) {
MVert *inMV;
MVert *mv = &mvert[numVerts];
MVert *mv2;
@@ -856,8 +861,6 @@
numVerts++;
indexMap[i].new = numVerts - 1;
- indexMap[i].merge = -1; /* default to no merge */
- indexMap[i].merge_final = 0; /* default to no merge */
VECCOPY(co, mv->co);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
