[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28057] trunk/blender/source/blender/ editors/mesh/editmesh_tools.c: [#21931] Rotate Edge CW inverted with CCW

Matt Ebb matt at mke3.net
Wed Apr 7 02:54:13 CEST 2010


Revision: 28057
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28057
Author:   broken
Date:     2010-04-07 02:54:13 +0200 (Wed, 07 Apr 2010)

Log Message:
-----------
[#21931] Rotate Edge CW inverted with CCW

Edge rotate directions were seemingly switched (when looking at geometry with face 
normal pointing at view), so flipped them.

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

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2010-04-07 00:43:06 UTC (rev 28056)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2010-04-07 00:54:13 UTC (rev 28057)
@@ -3657,10 +3657,10 @@
 		newFace[1]= EM_face_from_faces(em, face[1], face[0], p[1][1], p[1][2], 4+p[0][1], -1);
 	}
 	else if(fac1 == 4 && fac2 == 3) {
-		if(dir == DIRECTION_CW) {
+		if(dir == DIRECTION_CCW) {
 			newFace[0]= EM_face_from_faces(em, face[0], face[1], p[0][1], p[0][2], p[0][3], 4+p[1][1]);
 			newFace[1]= EM_face_from_faces(em, face[1], face[0], p[1][1], p[1][2], 4+p[0][1], -1);
-		} else if (dir == DIRECTION_CCW) {
+		} else if (dir == DIRECTION_CW) {
 			newFace[0]= EM_face_from_faces(em, face[0], face[1], p[0][2], 4+p[1][1], p[0][0], p[0][1]);
 			newFace[1]= EM_face_from_faces(em, face[1], face[0], 4+p[0][2], p[1][0], p[1][1], -1);
 
@@ -3669,10 +3669,10 @@
 		}
 	}
 	else if(fac1 == 3 && fac2 == 4) {
-		if(dir == DIRECTION_CW) {
+		if(dir == DIRECTION_CCW) {
 			newFace[0]= EM_face_from_faces(em, face[0], face[1], p[0][1], p[0][2], 4+p[1][1], -1);
 			newFace[1]= EM_face_from_faces(em, face[1], face[0], p[1][1], p[1][2], p[1][3], 4+p[0][1]);
-		} else if (dir == DIRECTION_CCW) {
+		} else if (dir == DIRECTION_CW) {
 			newFace[0]= EM_face_from_faces(em, face[0], face[1], p[0][0], p[0][1], 4+p[1][2], -1);
 			newFace[1]= EM_face_from_faces(em, face[1], face[0], p[1][1], p[1][2], 4+p[0][1], 4+p[0][2]);
 
@@ -3682,10 +3682,10 @@
 
 	}
 	else if(fac1 == 4 && fac2 == 4) {
-		if(dir == DIRECTION_CW) {
+		if(dir == DIRECTION_CCW) {
 			newFace[0]= EM_face_from_faces(em, face[0], face[1], p[0][1], p[0][2], p[0][3], 4+p[1][1]);
 			newFace[1]= EM_face_from_faces(em, face[1], face[0], p[1][1], p[1][2], p[1][3], 4+p[0][1]);
-		} else if (dir == DIRECTION_CCW) {
+		} else if (dir == DIRECTION_CW) {
 			newFace[0]= EM_face_from_faces(em, face[0], face[1], p[0][2], p[0][3], 4+p[1][1], 4+p[1][2]);
 			newFace[1]= EM_face_from_faces(em, face[1], face[0], p[1][2], p[1][3], 4+p[0][1], 4+p[0][2]);
 
@@ -3696,7 +3696,7 @@
 	else
 		return; /* This should never happen */
 
-	if(dir == DIRECTION_CW || (fac1 == 3 && fac2 == 3)) {
+	if(dir == DIRECTION_CCW || (fac1 == 3 && fac2 == 3)) {
 		verts[0][p[0][1]]->f |= SELECT;
 		verts[1][p[1][1]]->f |= SELECT;
 	}





More information about the Bf-blender-cvs mailing list