[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22793] branches/bmesh/blender/source/ blender/blenkernel/intern/subsurf_ccg.c: fix for having a modifier following subsurf

[Joseph Eagar]

Revision: 22793
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22793
Author:   joeedh
Date:     2009-08-26 07:59:12 +0200 (Wed, 26 Aug 2009)

Log Message:
-----------
fix for having a modifier following subsurf

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

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2009-08-26 02:18:47 UTC (rev 22792)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2009-08-26 05:59:12 UTC (rev 22793)
@@ -1461,13 +1461,13 @@
 		return;
 	}
 
-	if (fiter->head.index >= CCS_getNumFaces(fiter->cgdm->ss)) {
+	fiter->head.index++;
+	
+	if (fiter->head.index >= CCS_getNumFinalFaces(fiter->cgdm->ss)) {
 		fiter->head.done = 1;
 		return;
 	};
 
-	fiter->head.index++;
-	
 	cgdm_getFinalFace((DerivedMesh*)fiter->cgdm, fiter->head.index, &fiter->mface);
 
 	fiter->head.flags = fiter->mface.flag;
@@ -2616,8 +2616,6 @@
 	MCol *mcol;
 	MEdge *medge = NULL;
 	MFace *mface = NULL;
-	/*a spare loop that's not used by anything*/
-	int temp_loop = CCS_getNumFinalFaces(ss)*4;
 	FaceVertWeight *qweight, *tweight;
 
 	DM_from_template(&cgdm->dm, dm, CCS_getNumFinalVerts(ss),