[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21928] branches/bmesh/blender/source/ blender: revert part of this thing I was doing with ccgsubsurf

[Joseph Eagar]

Revision: 21928
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21928
Author:   joeedh
Date:     2009-07-26 15:26:59 +0200 (Sun, 26 Jul 2009)

Log Message:
-----------
revert part of this thing I was doing with ccgsubsurf

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2009-07-26 13:12:55 UTC (rev 21927)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2009-07-26 13:26:59 UTC (rev 21928)
@@ -2652,7 +2652,7 @@
 
 			for(x = 1; x < gridFaces; x++) {
 				float w[4];
-#if 1 //BMESH_TODO
+#if 0 //BMESH_TODO
 				w[prevS]  = weight[x][0][0];
 				w[S]      = weight[x][0][1];
 				w[nextS]  = weight[x][0][2];
@@ -2673,7 +2673,7 @@
 			for(y = 1; y < gridFaces; y++) {
 				for(x = 1; x < gridFaces; x++) {
 					float w[4];
-#if 1 //BMESH_TODO
+#if 0 //BMESH_TODO
 					w[prevS]  = weight[y * gridFaces + x][0][0];
 					w[S]      = weight[y * gridFaces + x][0][1];
 					w[nextS]  = weight[y * gridFaces + x][0][2];

Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c	2009-07-26 13:12:55 UTC (rev 21927)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c	2009-07-26 13:26:59 UTC (rev 21928)
@@ -374,7 +374,8 @@
 			ls[1] = efa->v2->tmp.p;
 			ls[2] = efa->v3->tmp.p;
 			
-			/*ensue correct winding*/
+			/*ensue correct winding.  I believe this is
+			  analogous to bubble sort on three elements.*/
 			if (BMINDEX_GET(ls[0]) > BMINDEX_GET(ls[1])) {
 				SWAP(BMLoop*, ls[0], ls[1]);
 			}