diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-15 00:06:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-15 00:06:28 +0300 |
commit | eac31a2eceb6601967484301c5f25b7a138f623b (patch) | |
tree | b70d5c1eced98e472d0c204ca3a126424a2ec57d /source/blender/blenkernel | |
parent | 94b9d2da547d88d5ca904351c04f5b00a6c0b278 (diff) |
remove unused vars & avoid some clang warnings.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/font.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/text.c | 1 |
5 files changed, 7 insertions, 13 deletions
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]); diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 9684e18b949..1d7ce197cba 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -757,7 +757,6 @@ struct chartrans *BKE_text_to_curve(Scene *scene, Object *ob, int mode) for (i = 0 ; i<=slen ; i++) { makebreak: // Characters in the list - che = vfd->characters.first; info = &(custrinfo[i]); ascii = mem[i]; if(info->flag & CU_CHINFO_SMALLCAPS) { @@ -1042,10 +1041,9 @@ struct chartrans *BKE_text_to_curve(Scene *scene, Object *ob, int mode) che= find_vfont_char(vfd, ascii); twidth = char_width(cu, che, info); - - dtime= distfac*0.35f*twidth; /* why not 0.5? */ - dtime= distfac*0.5f*twidth; /* why not 0.5? */ - + + dtime= distfac*0.5f*twidth; + ctime= timeofs + distfac*( ct->xof - minx); CLAMP(ctime, 0.0, 1.0); diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index c837f02279b..633d3aeafb9 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -440,7 +440,6 @@ void IDP_SyncGroupValues(IDProperty *dest, IDProperty *src) BLI_insertlinkafter(&dest->data.group, loop, copy); BLI_remlink(&dest->data.group, tmp); - loop = copy; IDP_FreeProperty(tmp); MEM_freeN(tmp); diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 2f90da2296b..36f618d04a9 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -2730,8 +2730,8 @@ static struct ImBuf * do_solid_color( unsigned char *rect; float *rect_float; - int x = context.rectx; - int y = context.recty; + /*int x = context.rectx;*/ /*UNUSED*/ + /*int y = context.recty;*/ /*UNUSED*/ if (out->rect) { unsigned char col0[3]; diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 20492b99048..1bd41c7aa86 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -280,7 +280,6 @@ int reopen_text(Text *text) text->mtime= st.st_mtime; text->nlines=0; - i=0; llen=0; for(i=0; i<len; i++) { if (buffer[i]=='\n') { |