[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34327] trunk/blender/source/blender: remove unused vars & avoid some clang warnings.
Campbell Barton
ideasman42 at gmail.com
Fri Jan 14 22:06:29 CET 2011
Revision: 34327
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34327
Author: campbellbarton
Date: 2011-01-14 21:06:28 +0000 (Fri, 14 Jan 2011)
Log Message:
-----------
remove unused vars & avoid some clang warnings.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/idprop.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/editors/curve/editfont.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-01-14 19:35:59 UTC (rev 34326)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-01-14 21:06:28 UTC (rev 34327)
@@ -958,14 +958,13 @@
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 @@
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 @@
}
}
- smoothnormal = (mface->flag & ME_SMOOTH);
-
if(!smoothnormal) {
if(nors) {
glNormal3fv(nors[a]);
Modified: trunk/blender/source/blender/blenkernel/intern/font.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/font.c 2011-01-14 19:35:59 UTC (rev 34326)
+++ trunk/blender/source/blender/blenkernel/intern/font.c 2011-01-14 21:06:28 UTC (rev 34327)
@@ -757,7 +757,6 @@
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 @@
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);
Modified: trunk/blender/source/blender/blenkernel/intern/idprop.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/idprop.c 2011-01-14 19:35:59 UTC (rev 34326)
+++ trunk/blender/source/blender/blenkernel/intern/idprop.c 2011-01-14 21:06:28 UTC (rev 34327)
@@ -440,7 +440,6 @@
BLI_insertlinkafter(&dest->data.group, loop, copy);
BLI_remlink(&dest->data.group, tmp);
- loop = copy;
IDP_FreeProperty(tmp);
MEM_freeN(tmp);
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2011-01-14 19:35:59 UTC (rev 34326)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2011-01-14 21:06:28 UTC (rev 34327)
@@ -2730,8 +2730,8 @@
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];
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2011-01-14 19:35:59 UTC (rev 34326)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2011-01-14 21:06:28 UTC (rev 34327)
@@ -280,7 +280,6 @@
text->mtime= st.st_mtime;
text->nlines=0;
- i=0;
llen=0;
for(i=0; i<len; i++) {
if (buffer[i]=='\n') {
Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c 2011-01-14 19:35:59 UTC (rev 34326)
+++ trunk/blender/source/blender/editors/curve/editfont.c 2011-01-14 21:06:28 UTC (rev 34327)
@@ -1221,7 +1221,7 @@
Scene *scene= CTX_data_scene(C);
Object *obedit= CTX_data_edit_object(C);
char *inserted_utf8;
- wchar_t *inserted_text, first;
+ wchar_t *inserted_text;
int a, len;
if(!RNA_property_is_set(op->ptr, "text"))
@@ -1232,7 +1232,6 @@
inserted_text= MEM_callocN(sizeof(wchar_t)*(len+1), "FONT_insert_text");
utf8towchar(inserted_text, inserted_utf8);
- first= inserted_text[0];
for(a=0; a<len; a++)
insert_into_textbuf(obedit, inserted_text[a]);
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c 2011-01-14 19:35:59 UTC (rev 34326)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c 2011-01-14 21:06:28 UTC (rev 34327)
@@ -3736,7 +3736,7 @@
int j, it2, maxiter2, it;
int nedges = chart->nedges, nwheel, gridx, gridy;
int edgesx, edgesy, nsize, esize, i, x, y, maxiter, totiter;
- float minv[2], maxv[2], median, invmedian, distortion, avglen2d, avglen3d;
+ float minv[2], maxv[2], median, invmedian, avglen2d, avglen3d;
float center[2], dx, dy, *nodes, dlimit, d, *oldnodesx, *oldnodesy;
float *nodesx, *nodesy, *hedges, *vedges, climit, moved, padding;
SmoothTriangle *triangles, *t, *t2, **tri, **trip;
@@ -3755,7 +3755,6 @@
invmedian = 1.0/median;
/* compute edge distortion */
- distortion = 0.0;
avglen2d = avglen3d = 0.0;
for (e=chart->edges; e; e=e->nextlink) {
Modified: trunk/blender/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2011-01-14 19:35:59 UTC (rev 34326)
+++ trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2011-01-14 21:06:28 UTC (rev 34327)
@@ -918,6 +918,8 @@
numfaces= dm->getNumFaces(dm);
for( i=0; i < numfaces; i++ ) {
+ const int smoothnormal = (mface[i].flag & ME_SMOOTH);
+
start = index[redir[mface[i].mat_nr+16383]];
if( mface[i].v4 )
index[redir[mface[i].mat_nr+16383]] += 18;
@@ -925,7 +927,7 @@
index[redir[mface[i].mat_nr+16383]] += 9;
/* v1 v2 v3 */
- if( mface[i].flag & ME_SMOOTH ) {
+ if(smoothnormal) {
VECCOPY(&varray[start],mvert[mface[i].v1].no);
VECCOPY(&varray[start+3],mvert[mface[i].v2].no);
VECCOPY(&varray[start+6],mvert[mface[i].v3].no);
@@ -947,7 +949,7 @@
if( mface[i].v4 ) {
/* v3 v4 v1 */
- if( mface[i].flag & ME_SMOOTH ) {
+ if(smoothnormal) {
VECCOPY(&varray[start+9],mvert[mface[i].v3].no);
VECCOPY(&varray[start+12],mvert[mface[i].v4].no);
VECCOPY(&varray[start+15],mvert[mface[i].v1].no);
Modified: trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c 2011-01-14 19:35:59 UTC (rev 34326)
+++ trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c 2011-01-14 21:06:28 UTC (rev 34327)
@@ -126,7 +126,6 @@
LogImageFile* logImage;
unsigned short* line, *pixel;
int i, j;
- int index;
float *fline;
float *fbuf;
int is_alloc= 0;
@@ -155,7 +154,6 @@
printf("error setting args\n");
}
- index = 0;
line = MEM_mallocN(sizeof(unsigned short)*depth*width, "line");
/*note that image is flipped when sent to logImageSetRowBytes (see last passed parameter).*/
More information about the Bf-blender-cvs
mailing list