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:
authorDaniel Dunbar <daniel@zuster.org>2005-03-31 21:15:44 +0400
committerDaniel Dunbar <daniel@zuster.org>2005-03-31 21:15:44 +0400
commitbb29f12924634f358feff5da895a02e598814cad (patch)
treed45b036d9565713e19c4506f11e6cfc00e752b85
parent9259ff35a4b836e88593f161796c498e1628a400 (diff)
- potential fix for crash on amd64
-rw-r--r--source/blender/blenkernel/intern/subsurf_ccg.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 09cd4cee653..5da9d17a421 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -567,7 +567,8 @@ static void subSurf_sync(SubSurf *ss) {
ccgSubSurf_initFullSync(ss->subSurf);
if (ss->controlType==SUBSURF_CONTROLTYPE_MESH) {
- int i, fVerts[4];
+ CCGVertHDL fVerts[4];
+ int i;
for (i=0; i<ss->me->totvert; i++) {
ccgSubSurf_syncVert(ss->subSurf, (CCGVertHDL) i, ss->me->mvert[i].co);
@@ -602,12 +603,12 @@ static void subSurf_sync(SubSurf *ss) {
MFace *mf = &((MFace*) ss->me->mface)[i];
if (mf->v3) {
- fVerts[0] = mf->v1;
- fVerts[1] = mf->v2;
- fVerts[2] = mf->v3;
- fVerts[3] = mf->v4;
+ fVerts[0] = (CCGVertHDL) mf->v1;
+ fVerts[1] = (CCGVertHDL) mf->v2;
+ fVerts[2] = (CCGVertHDL) mf->v3;
+ fVerts[3] = (CCGVertHDL) mf->v4;
- ccgSubSurf_syncFace(ss->subSurf, (CCGFaceHDL) i, fVerts[3]?4:3, (CCGVertHDL*) fVerts);
+ ccgSubSurf_syncFace(ss->subSurf, (CCGFaceHDL) i, fVerts[3]?4:3, fVerts);
}
}
} else {