[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33729] trunk/blender/source/blender/ editors/mesh/editmesh_lib.c: bugfix [#25260] Solidify function UV mapping problems

[Campbell Barton]

Revision: 33729
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33729
Author:   campbellbarton
Date:     2010-12-17 07:02:52 +0100 (Fri, 17 Dec 2010)

Log Message:
-----------
bugfix [#25260] Solidify function UV mapping problems

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_lib.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_lib.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_lib.c	2010-12-17 05:12:36 UTC (rev 33728)
+++ trunk/blender/source/blender/editors/mesh/editmesh_lib.c	2010-12-17 06:02:52 UTC (rev 33729)
@@ -1391,27 +1391,22 @@
 			if (efa->v4 && (efa->v4->tmp.v == NULL))
 				efa->v4->tmp.v = addvertlist(em, efa->v4->co, efa->v4);
 			
-			if(del_old==0) {	// keep old faces means flipping normal
-				if(efa->v4)
-					efan = addfacelist(em, efa->v4->tmp.v, efa->v3->tmp.v, 
-								efa->v2->tmp.v, efa->v1->tmp.v, efa, efa);
-				else
-					efan = addfacelist(em, efa->v3->tmp.v, efa->v2->tmp.v, 
-								efa->v1->tmp.v, NULL, efa, efa);
+			if(efa->v4)
+				efan = addfacelist(em, efa->v1->tmp.v, efa->v2->tmp.v,
+							efa->v3->tmp.v, efa->v4->tmp.v, efa, efa);
+			else
+				efan = addfacelist(em, efa->v1->tmp.v, efa->v2->tmp.v,
+							efa->v3->tmp.v, NULL, efa, efa);
+
+			/* keep old faces means flipping normal, reverse vertex order gives bad UV's & VCols etc - [#25260] */
+			if(del_old==0) {
+				flipface(em, efan);
 			}
-			else {
-				if(efa->v4)
-					efan = addfacelist(em, efa->v1->tmp.v, efa->v2->tmp.v, 
-								efa->v3->tmp.v, efa->v4->tmp.v, efa, efa);
-				else
-					efan = addfacelist(em, efa->v1->tmp.v, efa->v2->tmp.v, 
-								efa->v3->tmp.v, NULL, efa, efa);
-			}
-			
+
 			if (em->act_face == efa) {
 				em->act_face = efan; 
 			}
-			
+
 			/* for transform */
 			add_normal_aligned(nor, efa->n);
 		}