forked from bartvdbraak/blender
remove unused code, comment some that may be useful (maintainers can remove).
This commit is contained in:
parent
b69c1e8f1a
commit
d0e4f7b9f2
@ -1687,13 +1687,13 @@ static void dfs_range_query(RangeQueryData *data, BVHNode *node)
|
||||
{
|
||||
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
|
||||
{
|
||||
|
@ -1437,7 +1437,7 @@ int BLI_pbvh_node_planes_contain_AABB(PBVHNode *node, void *data)
|
||||
{
|
||||
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 @@ int BLI_pbvh_node_planes_contain_AABB(PBVHNode *node, void *data)
|
||||
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*/
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2115,7 +2115,7 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open))
|
||||
}
|
||||
|
||||
{
|
||||
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 @@ static void lib_verify_nodetree(Main *main, int UNUSED(open))
|
||||
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 */
|
||||
|
@ -372,7 +372,7 @@ static void add_bezt_to_keyblocks_list(DLRBT_Tree *blocks, DLRBT_Tree *beztTree,
|
||||
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 @@ static void add_bezt_to_keyblocks_list(DLRBT_Tree *blocks, DLRBT_Tree *beztTree,
|
||||
// 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 */
|
||||
|
@ -3460,7 +3460,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
|
||||
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 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
|
||||
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)
|
||||
|
@ -1595,12 +1595,12 @@ ScrArea *ED_screen_full_toggle(bContext *C, wmWindow *win, ScrArea *sa)
|
||||
|
||||
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 */
|
||||
|
@ -900,7 +900,7 @@ static void do_material_tex(GPUShadeInput *shi)
|
||||
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 @@ static void do_material_tex(GPUShadeInput *shi)
|
||||
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;
|
||||
}
|
||||
|
@ -532,7 +532,7 @@ struct ImBuf *imb_loadtarga(unsigned char *mem, size_t mem_size, int flags)
|
||||
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 @@ struct ImBuf *imb_loadtarga(unsigned char *mem, size_t mem_size, int flags)
|
||||
|
||||
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");
|
||||
|
||||
|
@ -855,12 +855,13 @@ void dna_write(FILE *file, void *pntr, int size)
|
||||
|
||||
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... */
|
||||
|
Loading…
Reference in New Issue
Block a user