[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36838] trunk/blender/source/blender: remove unused code, comment some that may be useful ( maintainers can remove).
Campbell Barton
ideasman42 at gmail.com
Mon May 23 17:23:31 CEST 2011
Revision: 36838
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36838
Author: campbellbarton
Date: 2011-05-23 15:23:31 +0000 (Mon, 23 May 2011)
Log Message:
-----------
remove unused code, comment some that may be useful (maintainers can remove).
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/animation/keyframes_draw.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/imbuf/intern/targa.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2011-05-23 14:56:14 UTC (rev 36837)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2011-05-23 15:23:31 UTC (rev 36838)
@@ -1687,13 +1687,13 @@
{
if(node->totnode == 0)
{
-
+#if 0 /*UNUSED*/
//Calculate the node min-coords (if the node was a point then this is the point coordinates)
float co[3];
co[0] = node->bv[0];
co[1] = node->bv[2];
co[2] = node->bv[4];
-
+#endif
}
else
{
Modified: trunk/blender/source/blender/blenlib/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/pbvh.c 2011-05-23 14:56:14 UTC (rev 36837)
+++ trunk/blender/source/blender/blenlib/intern/pbvh.c 2011-05-23 15:23:31 UTC (rev 36838)
@@ -1437,7 +1437,7 @@
{
float (*planes)[4] = data;
int i, axis;
- float vmin[3], vmax[3], bb_min[3], bb_max[3];
+ float vmin[3] /*, vmax[3]*/, bb_min[3], bb_max[3];
BLI_pbvh_node_get_BB(node, bb_min, bb_max);
@@ -1445,11 +1445,11 @@
for(axis = 0; axis < 3; ++axis) {
if(planes[i][axis] > 0) {
vmin[axis] = bb_min[axis];
- vmax[axis] = bb_max[axis];
+ /*vmax[axis] = bb_max[axis];*/ /*UNUSED*/
}
else {
vmin[axis] = bb_max[axis];
- vmax[axis] = bb_min[axis];
+ /*vmax[axis] = bb_min[axis];*/ /*UNUSED*/
}
}
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-05-23 14:56:14 UTC (rev 36837)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-05-23 15:23:31 UTC (rev 36838)
@@ -2115,7 +2115,7 @@
}
{
- int has_old_groups=0;
+ /*int has_old_groups=0;*/ /*UNUSED*/
/* XXX this should actually be part of do_versions, but since we need
* finished library linking, it is not possible there. Instead in do_versions
* we have set the NTREE_DO_VERSIONS flag, so at this point we can do the
@@ -2125,7 +2125,7 @@
if (ntree->flag & NTREE_DO_VERSIONS) {
/* this adds copies and links from all unlinked internal sockets to group inputs/outputs. */
nodeGroupExposeAllSockets(ntree);
- has_old_groups = 1;
+ /*has_old_groups = 1;*/ /*UNUSED*/
}
}
/* now verify all types in material trees, groups are set OK now */
Modified: trunk/blender/source/blender/editors/animation/keyframes_draw.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_draw.c 2011-05-23 14:56:14 UTC (rev 36837)
+++ trunk/blender/source/blender/editors/animation/keyframes_draw.c 2011-05-23 15:23:31 UTC (rev 36838)
@@ -372,7 +372,7 @@
blocks->root= (DLRBT_Node *)new_ab;
}
else {
- ActKeyBlock *ab, *abp=NULL, *abn=NULL;
+ ActKeyBlock *ab, *abn=NULL;
/* try to find a keyblock that starts on the previous beztriple, and add a new one if none start there
* Note: we can't search from end to try to optimise this as it causes errors there's
@@ -382,7 +382,7 @@
// A|--------------|A ______________ B|--------------|B
// A|------------------------------------------------|A
// A|----|A|---|A|-----------------------------------|A
- for (ab= blocks->root; ab; abp= ab, ab= abn) {
+ for (ab= blocks->root; ab; ab= abn) {
/* check if this is a match, or whether we go left or right */
if (ab->start == prev->vec[1][0]) {
/* set selection status and 'touched' status */
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c 2011-05-23 14:56:14 UTC (rev 36837)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c 2011-05-23 15:23:31 UTC (rev 36838)
@@ -3460,7 +3460,7 @@
ParticleBrushData *brush= &pset->brush[pset->brushtype];
ARegion *ar= CTX_wm_region(C);
float vec[3], mousef[2];
- int mval[2], mvalo[2];
+ int mval[2];
int flip, mouse[2], dx, dy, removed= 0, added=0, selected= 0;
int lock_root = pset->flag & PE_LOCK_FIRST;
@@ -3483,8 +3483,6 @@
mval[0]= mouse[0];
mval[1]= mouse[1];
- mvalo[0]= bedit->lastmouse[0];
- mvalo[1]= bedit->lastmouse[1];
/* disable locking temporatily for disconnected hair */
if(edit->psys && edit->psys->flag & PSYS_GLOBAL_HAIR)
Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c 2011-05-23 14:56:14 UTC (rev 36837)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c 2011-05-23 15:23:31 UTC (rev 36838)
@@ -1595,12 +1595,12 @@
if(sa && sa->full) {
ScrArea *old;
- short fulltype;
+ /*short fulltype;*/ /*UNUSED*/
sc= sa->full; /* the old screen to restore */
oldscreen= win->screen; /* the one disappearing */
- fulltype = sc->full;
+ /*fulltype = sc->full;*/
sc->full= 0;
/* removed: SCREENAUTOPLAY exception here */
Modified: trunk/blender/source/blender/gpu/intern/gpu_material.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_material.c 2011-05-23 14:56:14 UTC (rev 36837)
+++ trunk/blender/source/blender/gpu/intern/gpu_material.c 2011-05-23 15:23:31 UTC (rev 36838)
@@ -900,7 +900,7 @@
GPUNodeLink *texco_norm, *texco_orco, *texco_object;
GPUNodeLink *texco_global, *texco_uv = NULL;
GPUNodeLink *newnor, *orn;
- char *lastuvname = NULL;
+ /*char *lastuvname = NULL;*/ /*UNUSED*/
float one = 1.0f, norfac, ofs[3];
int tex_nr, rgbnor, talpha;
int init_done = 0, iBumpSpacePrev;
@@ -947,7 +947,7 @@
else if(mtex->texco==TEXCO_UV) {
if(1) { //!(texco_uv && strcmp(mtex->uvname, lastuvname) == 0)) {
GPU_link(mat, "texco_uv", GPU_attribute(CD_MTFACE, mtex->uvname), &texco_uv);
- lastuvname = mtex->uvname;
+ /*lastuvname = mtex->uvname;*/ /*UNUSED*/
}
texco= texco_uv;
}
Modified: trunk/blender/source/blender/imbuf/intern/targa.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/targa.c 2011-05-23 14:56:14 UTC (rev 36837)
+++ trunk/blender/source/blender/imbuf/intern/targa.c 2011-05-23 15:23:31 UTC (rev 36838)
@@ -532,7 +532,7 @@
TARGA tga;
struct ImBuf * ibuf;
int col, count, size;
- unsigned int *rect, *cmap= NULL, mincol= 0, maxcol= 0;
+ unsigned int *rect, *cmap= NULL /*, mincol= 0*/, maxcol= 0;
uchar * cp = (uchar *) &col;
if (checktarga(&tga,mem) == 0) return(NULL);
@@ -550,7 +550,7 @@
if (tga.mapsize){
/* load color map */
- mincol = tga.maporig;
+ /*mincol = tga.maporig;*/ /*UNUSED*/
maxcol = tga.mapsize;
cmap = MEM_callocN(sizeof(unsigned int)*maxcol, "targa cmap");
Modified: trunk/blender/source/blender/makesdna/intern/makesdna.c
===================================================================
--- trunk/blender/source/blender/makesdna/intern/makesdna.c 2011-05-23 14:56:14 UTC (rev 36837)
+++ trunk/blender/source/blender/makesdna/intern/makesdna.c 2011-05-23 15:23:31 UTC (rev 36838)
@@ -855,12 +855,13 @@
void printStructLenghts(void)
{
- int a, unknown= nr_structs, lastunknown, structtype;
+ int a, unknown= nr_structs, structtype;
+ /*int lastunknown;*/ /*UNUSED*/
short *structpoin;
printf("\n\n*** All detected structs:\n");
while(unknown) {
- lastunknown= unknown;
+ /*lastunknown= unknown;*/ /*UNUSED*/
unknown= 0;
/* check all structs... */
More information about the Bf-blender-cvs
mailing list