From eac31a2eceb6601967484301c5f25b7a138f623b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 14 Jan 2011 21:06:28 +0000 Subject: remove unused vars & avoid some clang warnings. --- source/blender/blenkernel/intern/cdderivedmesh.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c') diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 8bb336d1c4d..71e704fe6c8 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -958,14 +958,13 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, vo MFace *mface = cddm->mface; MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE); float (*nors)[3] = dm->getFaceDataArray(dm, CD_NORMAL); - int a, b, dodraw, smoothnormal, matnr, new_matnr; + int a, b, dodraw, matnr, new_matnr; int transp, new_transp, orig_transp; int orig, *index = dm->getFaceDataArray(dm, CD_ORIGINDEX); cdDM_update_normals_from_pbvh(dm); matnr = -1; - smoothnormal = 0; dodraw = 0; transp = GPU_get_material_blend_mode(); orig_transp = transp; @@ -979,6 +978,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, vo glBegin(GL_QUADS); for(a = 0; a < dm->numFaceData; a++, mface++) { + const int smoothnormal = (mface->flag & ME_SMOOTH); new_matnr = mface->mat_nr + 1; if(new_matnr != matnr) { @@ -1023,8 +1023,6 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, vo } } - smoothnormal = (mface->flag & ME_SMOOTH); - if(!smoothnormal) { if(nors) { glNormal3fv(nors[a]); -- cgit v1.2.3