diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2004-03-15 00:21:08 +0300 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2004-03-15 00:21:08 +0300 |
| commit | 807db2ea4077cb198c696c65b77a6bab23cacd02 (patch) | |
| tree | f5a6b14bb321bb0cab36e5c4c34b4b7724c51897 /source/blender/src/drawmesh.c | |
| parent | dd3c9c0c466d74d20e42db6ec994dc0ddbb7ee9b (diff) | |
- redundant code killing for MFaceInt removal
Diffstat (limited to 'source/blender/src/drawmesh.c')
| -rw-r--r-- | source/blender/src/drawmesh.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/source/blender/src/drawmesh.c b/source/blender/src/drawmesh.c index 4b1338cba3f..1e851e0dedd 100644 --- a/source/blender/src/drawmesh.c +++ b/source/blender/src/drawmesh.c @@ -780,7 +780,6 @@ void draw_tface_mesh(Object *ob, Mesh *me, int dt) if(dt > OB_SOLID) { bProperty *prop = get_property(ob, "Text"); - MFace *mfaceint= NULL; int editing= (G.f & (G_VERTEXPAINT+G_FACESELECT+G_TEXTUREPAINT+G_WEIGHTPAINT)) && (ob==((G.scene->basact) ? (G.scene->basact->object) : 0)); MVert *mvert=NULL; int totface; @@ -796,7 +795,7 @@ void draw_tface_mesh(Object *ob, Mesh *me, int dt) else { totface= dlm->totface; mvert= dlm->mvert; - mfaceint= dlm->mface; + mface= dlm->mface; tface= dlm->tface; } } @@ -813,26 +812,14 @@ void draw_tface_mesh(Object *ob, Mesh *me, int dt) for (a=0; a<totface; a++, tface++) { int v1idx, v2idx, v3idx, v4idx, mf_smooth, matnr, badtex; float *v1, *v2, *v3, *v4; - - if (mfaceint) { - MFace *mf= &mfaceint[a]; - - v1idx= mf->v1; - v2idx= mf->v2; - v3idx= mf->v3; - v4idx= mf->v4; - mf_smooth= mf->flag & ME_SMOOTH; - matnr= mf->mat_nr; - } else { - MFace *mf= &mface[a]; - - v1idx= mf->v1; - v2idx= mf->v2; - v3idx= mf->v3; - v4idx= mf->v4; - mf_smooth= mf->flag & ME_SMOOTH; - matnr= mf->mat_nr; - } + MFace *mf= &mface[a]; + + v1idx= mf->v1; + v2idx= mf->v2; + v3idx= mf->v3; + v4idx= mf->v4; + mf_smooth= mf->flag & ME_SMOOTH; + matnr= mf->mat_nr; if(v3idx==0) continue; if(tface->flag & TF_HIDE) continue; |