[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15952] trunk/blender/source/blender/ blenkernel/intern/modifier.c: Fix for [#17291] Array modifier merge caps leaves a whole

[Ben Batt]

Revision: 15952
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15952
Author:   artificer
Date:     2008-08-04 18:44:13 +0200 (Mon, 04 Aug 2008)

Log Message:
-----------
Fix for [#17291] Array modifier merge caps leaves a whole
This code was missing a test_index_face call after merging, so it was making
quads with v4 == 0.

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-08-04 
14:49:55 UTC (rev 15951)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c   2008-08-04 
16:44:13 UTC (rev 15952)
@@ -1130,8 +1130,18 @@
                                  mface[numFaces].v1 = 
vert_map[mface[numFaces].v1];
                                  mface[numFaces].v2 = 
vert_map[mface[numFaces].v2];
                                  mface[numFaces].v3 = 
vert_map[mface[numFaces].v3];
-                                 if(mface[numFaces].v4)
+                                 if(mface[numFaces].v4) {
                                          mface[numFaces].v4 = 
vert_map[mface[numFaces].v4];
+
+                                         test_index_face(&mface[numFaces], 
&result->faceData,
+                                                         numFaces, 4);
+                                 }
+                                 else
+                                 {
+                                         test_index_face(&mface[numFaces], 
&result->faceData,
+                                                         numFaces, 3);
+                                 }
+
                                  origindex[numFaces] = ORIGINDEX_NONE;
 
                                  numFaces++;
@@ -1221,8 +1231,17 @@
                                  mface[numFaces].v1 = 
vert_map[mface[numFaces].v1];
                                  mface[numFaces].v2 = 
vert_map[mface[numFaces].v2];
                                  mface[numFaces].v3 = 
vert_map[mface[numFaces].v3];
-                                 if(mface[numFaces].v4)
+                                 if(mface[numFaces].v4) {
                                          mface[numFaces].v4 = 
vert_map[mface[numFaces].v4];
+
+                                         test_index_face(&mface[numFaces], 
&result->faceData,
+                                                         numFaces, 4);
+                                 }
+                                 else
+                                 {
+                                         test_index_face(&mface[numFaces], 
&result->faceData,
+                                                         numFaces, 3);
+                                 }
                                  origindex[numFaces] = ORIGINDEX_NONE;
 
                                  numFaces++;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs