[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34110] trunk/blender/source/blender: remove assignments which are unused.
Campbell Barton
ideasman42 at gmail.com
Thu Jan 6 02:29:13 CET 2011
Revision: 34110
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34110
Author: campbellbarton
Date: 2011-01-06 02:29:13 +0100 (Thu, 06 Jan 2011)
Log Message:
-----------
remove assignments which are unused.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/blenloader/intern/readblenentry.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/interface/interface_utils.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
trunk/blender/source/blender/render/intern/source/texture.c
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2011-01-05 23:23:09 UTC (rev 34109)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2011-01-06 01:29:13 UTC (rev 34110)
@@ -625,7 +625,6 @@
Object *ob= base->object;
DispList *dl, *dlob;
Material *ma = NULL;
- Curve *cu;
Render *re;
float imat[3][3], mat[4][4], vec[3];
float *fp, *nor, n1[3];
@@ -659,7 +658,6 @@
if (ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
/* now we need the normals */
- cu= ob->data;
dl= ob->disp.first;
while(dl) {
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-01-05 23:23:09 UTC (rev 34109)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-01-06 01:29:13 UTC (rev 34110)
@@ -115,7 +115,7 @@
/* Common functions */
static int ptcache_basic_header_read(PTCacheFile *pf)
{
- uint32_t totpoint, data_types;
+ uint32_t totpoint, data_types= 0;
int error=0;
/* Custom functions should read these basic elements too! */
Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c 2011-01-05 23:23:09 UTC (rev 34109)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c 2011-01-06 01:29:13 UTC (rev 34110)
@@ -827,7 +827,7 @@
sub_v3_v3v3(bv,v0,p1);
elen2 = dot_v3v3(e1,e1);
edotv = dot_v3v3(e1,vel);
- edotbv = dot_v3v3(e1,bv);
+ /* edotbv = dot_v3v3(e1,bv); */ /* UNUSED */
sub_v3_v3v3(bv,v1,p1);
elen2 = dot_v3v3(e3,e3);
@@ -972,7 +972,6 @@
{
float a[3], b[3], c[3], ab[3], cb[3], ca[3], dir1[3], dir2[3];
float d;
- float d1;
sub_v3_v3v3(c, v3, v1);
sub_v3_v3v3(a, v2, v1);
@@ -985,8 +984,6 @@
/* colinear or one vector is zero-length*/
return 0;
}
-
- d1 = d;
cross_v3_v3v3(ab, a, b);
d = dot_v3v3(c, ab);
Modified: trunk/blender/source/blender/blenloader/intern/readblenentry.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readblenentry.c 2011-01-05 23:23:09 UTC (rev 34109)
+++ trunk/blender/source/blender/blenloader/intern/readblenentry.c 2011-01-06 01:29:13 UTC (rev 34110)
@@ -169,11 +169,11 @@
memcpy(new_prv, prv, sizeof(PreviewImage));
if (prv->rect[0]) {
unsigned int *rect = NULL;
- int rectlen = 0;
+ // int rectlen = 0;
new_prv->rect[0] = MEM_callocN(new_prv->w[0]*new_prv->h[0]*sizeof(unsigned int), "prvrect");
bhead= blo_nextbhead(fd, bhead);
rect = (unsigned int*)(bhead+1);
- rectlen = new_prv->w[0]*new_prv->h[0]*sizeof(unsigned int);
+ // rectlen = new_prv->w[0]*new_prv->h[0]*sizeof(unsigned int);
memcpy(new_prv->rect[0], rect, bhead->len);
} else {
new_prv->rect[0] = NULL;
@@ -181,11 +181,11 @@
if (prv->rect[1]) {
unsigned int *rect = NULL;
- int rectlen = 0;
+ // int rectlen = 0;
new_prv->rect[1] = MEM_callocN(new_prv->w[1]*new_prv->h[1]*sizeof(unsigned int), "prvrect");
bhead= blo_nextbhead(fd, bhead);
rect = (unsigned int*)(bhead+1);
- rectlen = new_prv->w[1]*new_prv->h[1]*sizeof(unsigned int);
+ // rectlen = new_prv->w[1]*new_prv->h[1]*sizeof(unsigned int);
memcpy(new_prv->rect[1], rect, bhead->len);
} else {
new_prv->rect[1] = NULL;
Modified: trunk/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseobject.c 2011-01-05 23:23:09 UTC (rev 34109)
+++ trunk/blender/source/blender/editors/armature/poseobject.c 2011-01-06 01:29:13 UTC (rev 34110)
@@ -791,7 +791,7 @@
}
else { /* constraints, optional (note: max we can have is 24 constraints) */
bConstraint *con, *con_back;
- int const_toggle[24];
+ int const_toggle[24]= {0}; /* XXX, initialize as 0 to quiet errors */
ListBase const_copy = {NULL, NULL};
BLI_duplicatelist(&const_copy, &(pchanact->constraints));
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2011-01-05 23:23:09 UTC (rev 34109)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2011-01-06 01:29:13 UTC (rev 34110)
@@ -5710,11 +5710,10 @@
}
else if(type==1) { /* erase segment */
/* find the 2 selected points */
- bezt1= bezt2= 0;
- bp1= bp2= 0;
- nu= nubase->first;
- nu1= 0;
- while(nu) {
+ bezt1= bezt2= NULL;
+ bp1= bp2= NULL;
+ nu1= NULL;
+ for(nu= nubase->first; nu; nu= nu->next) {
next= nu->next;
if(nu->type == CU_BEZIER) {
bezt= nu->bezt;
@@ -5770,8 +5769,6 @@
}
}
if(nu1) break;
-
- nu= nu->next;
}
if(nu1) {
if(bezt1) {
Modified: trunk/blender/source/blender/editors/interface/interface_utils.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_utils.c 2011-01-05 23:23:09 UTC (rev 34109)
+++ trunk/blender/source/blender/editors/interface/interface_utils.c 2011-01-06 01:29:13 UTC (rev 34110)
@@ -56,19 +56,11 @@
switch(RNA_property_type(prop)) {
case PROP_BOOLEAN: {
- int value, length;
if(arraylen && index == -1)
return NULL;
-
- length= RNA_property_array_length(ptr, prop);
-
- if(length)
- value= RNA_property_boolean_get_index(ptr, prop, index);
- else
- value= RNA_property_boolean_get(ptr, prop);
- if(icon && name && strcmp(name, "") == 0)
+ if(icon && name && name[0] == '\0')
but= uiDefIconButR(block, ICONTOG, 0, icon, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
else if(icon)
but= uiDefIconTextButR(block, ICONTOG, 0, icon, name, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
Modified: trunk/blender/source/blender/editors/space_text/text_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_draw.c 2011-01-05 23:23:09 UTC (rev 34109)
+++ trunk/blender/source/blender/editors/space_text/text_draw.c 2011-01-06 01:29:13 UTC (rev 34110)
@@ -1050,7 +1050,7 @@
}
}
} else {
- for(i=st->top, pline= text->lines.first; pline->next && i>0; i--)
+ for(i=st->top; pline->next && i>0; i--)
pline= pline->next;
}
@@ -1284,7 +1284,7 @@
{
TextLine *tmp;
char *docs, buf[DOC_WIDTH+1], *p;
- int len, i, br, lines;
+ int i, br, lines;
int boxw, boxh, l, x, y, top;
if(!st || !st->text) return;
@@ -1309,7 +1309,6 @@
}
top= y= ar->winy - st->lheight*l - 2;
- len= strlen(docs);
boxw= DOC_WIDTH*st->cwidth + 20;
boxh= (DOC_HEIGHT+1)*st->lheight;
Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c 2011-01-05 23:23:09 UTC (rev 34109)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c 2011-01-06 01:29:13 UTC (rev 34110)
@@ -1344,16 +1344,17 @@
/* get cursor position in line by relative wrapped line and column positions */
static int text_get_cursor_rel(SpaceText* st, ARegion *ar, TextLine *linein, int rell, int relc)
{
- int i, j, start, end, chars, max, chop, curs, loop, endj, found, selc;
+ int i, j, start, end, max, chop, curs, loop, endj, found, selc;
char ch;
max= wrap_width(st, ar);
- selc= start= chars= endj= curs= found= 0;
+ selc= start= endj= curs= found= 0;
end= max;
chop= loop= 1;
for(i=0, j=0; loop; j++) {
+ int chars;
/* Mimic replacement of tabs */
ch= linein->line[j];
if(ch=='\t') {
@@ -1509,7 +1510,7 @@
Text *text= st->text;
TextLine **linep;
int *charp;
- int oldl, oldc, i, j, max, start, end, chars, endj, chop, loop;
+ int oldl, oldc, i, j, max, start, end, endj, chop, loop;
char ch;
text_update_character_width(st);
@@ -1522,12 +1523,13 @@
max= wrap_width(st, ar);
- start= chars= endj= 0;
+ start= endj= 0;
end= max;
chop= loop= 1;
*charp= 0;
for(i=0, j=0; loop; j++) {
+ int chars;
/* Mimic replacement of tabs */
ch= (*linep)->line[j];
if(ch=='\t') {
@@ -1576,7 +1578,7 @@
Text *text= st->text;
TextLine **linep;
int *charp;
- int oldl, oldc, i, j, max, start, end, chars, endj, chop, loop;
+ int oldl, oldc, i, j, max, start, end, endj, chop, loop;
char ch;
text_update_character_width(st);
@@ -1589,12 +1591,13 @@
max= wrap_width(st, ar);
- start= chars= endj= 0;
+ start= endj= 0;
end= max;
chop= loop= 1;
*charp= 0;
for(i=0, j=0; loop; j++) {
+ int chars;
/* Mimic replacement of tabs */
ch= (*linep)->line[j];
if(ch=='\t') {
@@ -2241,7 +2244,7 @@
x = (x/st->cwidth) + st->left;
if(st->wordwrap) {
- int i, j, endj, curs, max, chop, start, end, chars, loop, found;
+ int i, j, endj, curs, max, chop, start, end, loop, found;
char ch;
/* Point to first visible line */
@@ -2267,10 +2270,10 @@
start= 0;
end= max;
chop= 1;
- chars= 0;
curs= 0;
endj= 0;
for(i=0, j=0; loop; j++) {
+ int chars;
/* Mimic replacement of tabs */
ch= (*linep)->line[j];
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c 2011-01-05 23:23:09 UTC (rev 34109)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c 2011-01-06 01:29:13 UTC (rev 34110)
@@ -90,15 +90,15 @@
/* outputs: value, color, normal */
if(node->id) {
- RenderData *rd= data;
- short sizex, sizey;
+ /* RenderData *rd= data; */
+ /* short sizex, sizey; */
/* first make the preview image */
CompBuf *prevbuf= alloc_compbuf(140, 140, CB_RGBA, 1); /* alloc */
/* Also take care about the render size! */
- sizex = (rd->size*rd->xsch)/100;
- sizey = (rd->size*rd->ysch)/100;
+ /* sizex = (rd->size*rd->xsch)/100; */
+ /* sizey = (rd->size*rd->ysch)/100; */
prevbuf->rect_procedural= texture_procedural;
prevbuf->node= node;
Modified: trunk/blender/source/blender/render/intern/source/texture.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list