Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Eagar <joeedh@gmail.com>2009-08-26 09:59:12 +0400
committerJoseph Eagar <joeedh@gmail.com>2009-08-26 09:59:12 +0400
commita34ffefa0025d144826cd1bf7a136af743847f1b (patch)
tree110d12706309b66ed3e42bdc8a132297e38f4d96
parentfad1c3fb58f9a6ee4814d005b0be182b71546c22 (diff)
fix for having a modifier following subsurf
-rw-r--r--source/blender/blenkernel/intern/subsurf_ccg.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 820aa9e1b21..f5133759a4d 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -1461,13 +1461,13 @@ void cgdm_faceIterStep(void *self)
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 @@ static CCGDerivedMesh *getCCGDerivedMesh(CSubSurf *ss,
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),