[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39190] branches/bmesh/blender/source/ blender/blenkernel/intern: fix mirror when have dup faces; prevent eekadoodle on tess recalculation

[Howard Trickey]

Revision: 39190
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39190
Author:   howardt
Date:     2011-08-08 17:30:19 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
fix mirror when have dup faces; prevent eekadoodle on tess recalculation

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-08-08 17:23:26 UTC (rev 39189)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-08-08 17:30:19 UTC (rev 39190)
@@ -2236,15 +2236,8 @@
 		if (ml->v == -1)
 			continue;
 		
-		if (vtargetmap[ml->v] != -1) {
-			me = &cddm->medge[ml->e];
-			if (me->v1 == ml->v)
-				me->v1 = vtargetmap[ml->v];
-			else
-				me->v2 = vtargetmap[ml->v];
-			
+		if (vtargetmap[ml->v] != -1)
 			ml->v = vtargetmap[ml->v];
-		}
 	}
 	
 	/*now go through and fix edges and faces*/

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c	2011-08-08 17:23:26 UTC (rev 39189)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c	2011-08-08 17:30:19 UTC (rev 39190)
@@ -2364,6 +2364,14 @@
 		mf->v2 = mloop[mf->v2].v;
 		mf->v3 = mloop[mf->v3].v;
 
+		if(mf->v3==0) {
+			/*prevent eekadoodle*/
+			SWAP(int, mf->v1, mf->v2);
+			SWAP(int, mf->v2, mf->v3);
+			SWAP(int, lindex[0], lindex[1]);
+			SWAP(int, lindex[1], lindex[2]);
+		}
+
 		mesh_loops_to_tri_corners(fdata, ldata, pdata,
 			lindex, i, mf->v4);