Commented and tagged some unused vars, added some var init (gcc warnings...)

This commit is contained in:
Bastien Montagne
2011-09-28 15:22:13 +00:00
parent 113d556295
commit 35f881b44d
7 changed files with 27 additions and 19 deletions

View File

@@ -741,7 +741,7 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm )
MDeformVert *dvert = NULL; MDeformVert *dvert = NULL;
Cloth *clothObj = NULL; Cloth *clothObj = NULL;
int numverts; int numverts;
float goalfac = 0; /* float goalfac = 0; */ /* UNUSED */
ClothVertex *verts = NULL; ClothVertex *verts = NULL;
if (!clmd || !dm) return; if (!clmd || !dm) return;
@@ -764,7 +764,7 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm )
if (( dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_mass-1)) && (clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL )) if (( dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_mass-1)) && (clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL ))
{ {
verts->goal = dvert->dw [j].weight; verts->goal = dvert->dw [j].weight;
goalfac= 1.0f; /* goalfac= 1.0f; */ /* UNUSED */
/* /*
// Kicking goal factor to simplify things...who uses that anyway? // Kicking goal factor to simplify things...who uses that anyway?

View File

@@ -2364,7 +2364,7 @@ int cloth_bvh_objcollision (Object *ob, ClothModifierData * clmd, float step, fl
{ {
Cloth *cloth= clmd->clothObject; Cloth *cloth= clmd->clothObject;
BVHTree *cloth_bvh= cloth->bvhtree; BVHTree *cloth_bvh= cloth->bvhtree;
unsigned int i=0, numfaces = 0, numverts = 0, k, l, j; unsigned int i=0, /* numfaces = 0, */ /* UNUSED */ numverts = 0, k, l, j;
int rounds = 0; // result counts applied collisions; ic is for debug output; int rounds = 0; // result counts applied collisions; ic is for debug output;
ClothVertex *verts = NULL; ClothVertex *verts = NULL;
int ret = 0, ret2 = 0; int ret = 0, ret2 = 0;
@@ -2375,7 +2375,7 @@ int cloth_bvh_objcollision (Object *ob, ClothModifierData * clmd, float step, fl
return 0; return 0;
verts = cloth->verts; verts = cloth->verts;
numfaces = cloth->numfaces; /* numfaces = cloth->numfaces; */ /* UNUSED */
numverts = cloth->numverts; numverts = cloth->numverts;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@@ -2477,7 +2477,7 @@ int cloth_bvh_objcollision (Object *ob, ClothModifierData * clmd, float step, fl
// collisions = 1; // collisions = 1;
verts = cloth->verts; // needed for openMP verts = cloth->verts; // needed for openMP
numfaces = cloth->numfaces; /* numfaces = cloth->numfaces; */ /* UNUSED */
numverts = cloth->numverts; numverts = cloth->numverts;
verts = cloth->verts; verts = cloth->verts;

View File

@@ -344,15 +344,19 @@ short ANIM_animdata_get_context (const bContext *C, bAnimContext *ac)
* keep expander channels with no sub-data out, as those cases should get * keep expander channels with no sub-data out, as those cases should get
* dealt with by the recursive detection idiom in place. * dealt with by the recursive detection idiom in place.
*/ */
/* XXX Commented most of that macro, since it seems that _doSubChannels var is never used...
* mont29.
*/
#define BEGIN_ANIMFILTER_SUBCHANNELS(expanded_check) \ #define BEGIN_ANIMFILTER_SUBCHANNELS(expanded_check) \
{ \ { \
int _filter = filter_mode; \ int _filter = filter_mode; \
short _doSubChannels = 0; \ /* short _doSubChannels = 0; \*/ \
if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || (expanded_check)) \ /* if (!(filter_mode & ANIMFILTER_LIST_VISIBLE) || (expanded_check)) \*/ \
_doSubChannels=1; \ /* _doSubChannels=1; \*/ \
else if (!(filter_mode & ANIMFILTER_LIST_CHANNELS)) \ /* else if (!(filter_mode & ANIMFILTER_LIST_CHANNELS)) \*/ \
_doSubChannels=2; \ /* _doSubChannels=2; \*/ \
else {\ /* else {\*/ \
if (!(!(filter_mode & ANIMFILTER_LIST_VISIBLE) || (expanded_check) || !(filter_mode & ANIMFILTER_LIST_CHANNELS))) { \
filter_mode |= ANIMFILTER_TMP_PEEK; \ filter_mode |= ANIMFILTER_TMP_PEEK; \
} }
/* ... standard sub-channel filtering can go on here now ... */ /* ... standard sub-channel filtering can go on here now ... */

View File

@@ -889,11 +889,13 @@ void SEQUENCER_OT_select_border(wmOperatorType *ot)
static EnumPropertyItem sequencer_prop_select_grouped_types[] = { static EnumPropertyItem sequencer_prop_select_grouped_types[] = {
{1, "TYPE", 0, "Type", "Shared strip type"}, {1, "TYPE", 0, "Type", "Shared strip type"},
{2, "TYPE_BASIC", 0, "Global Type", "All strips of same basic type (Graphical or Sound)"}, {2, "TYPE_BASIC", 0, "Global Type", "All strips of same basic type (Graphical or Sound)"},
{3, "TYPE_EFFECT", 0, "Effect Type", "Shared strip effect type (if active strip is not an effect one, select all non-effect strips)"}, {3, "TYPE_EFFECT", 0, "Effect Type",
"Shared strip effect type (if active strip is not an effect one, select all non-effect strips)"},
{4, "DATA", 0, "Data", "Shared data (scene, image, sound, etc.)"}, {4, "DATA", 0, "Data", "Shared data (scene, image, sound, etc.)"},
{5, "EFFECT", 0, "Effect", "Shared effects"}, {5, "EFFECT", 0, "Effect", "Shared effects"},
{6, "EFFECT_LINK", 0, "Effect/Linked", "Other strips affected by the active one (sharing some time, and below or effect-assigned)"}, {6, "EFFECT_LINK", 0, "Effect/Linked",
{7, "OVERLAP", 0, "Overlap", "Overlapping time"}, "Other strips affected by the active one (sharing some time, and below or effect-assigned)"},
{7, "OVERLAP", 0, "Overlap", "Overlapping time"},
{0, NULL, 0, NULL, NULL} {0, NULL, 0, NULL, NULL}
}; };
@@ -1033,7 +1035,7 @@ static short select_grouped_time_overlap(Editing *ed, Sequence *actseq)
static short select_grouped_effect_link(Editing *ed, Sequence *actseq) static short select_grouped_effect_link(Editing *ed, Sequence *actseq)
{ {
Sequence *seq; Sequence *seq = NULL;
short changed = FALSE; short changed = FALSE;
short is_audio = ((actseq->type == SEQ_META) || SEQ_IS_SOUND(actseq)); short is_audio = ((actseq->type == SEQ_META) || SEQ_IS_SOUND(actseq));
int startdisp = actseq->startdisp; int startdisp = actseq->startdisp;

View File

@@ -903,7 +903,7 @@ static void do_material_tex(GPUShadeInput *shi)
/*char *lastuvname = NULL;*/ /*UNUSED*/ /*char *lastuvname = NULL;*/ /*UNUSED*/
float one = 1.0f, norfac, ofs[3]; float one = 1.0f, norfac, ofs[3];
int tex_nr, rgbnor, talpha; int tex_nr, rgbnor, talpha;
int init_done = 0, iBumpSpacePrev; int init_done = 0, iBumpSpacePrev = 0; /* Not necessary, quiting gcc warning. */
GPUNodeLink *vNorg, *vNacc, *fPrevMagnitude; GPUNodeLink *vNorg, *vNacc, *fPrevMagnitude;
int iFirstTimeNMap=1; int iFirstTimeNMap=1;
int found_deriv_map = 0; int found_deriv_map = 0;

View File

@@ -900,8 +900,8 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position,
long long st_time; long long st_time;
struct anim_index * tc_index = 0; struct anim_index * tc_index = 0;
AVStream * v_st; AVStream * v_st;
int new_frame_index; int new_frame_index = 0; /* To quite gcc barking... */
int old_frame_index; int old_frame_index = 0; /* To quite gcc barking... */
if (anim == 0) return (0); if (anim == 0) return (0);

View File

@@ -558,7 +558,9 @@ static DerivedMesh * cutEdges(ExplodeModifierData *emd, DerivedMesh *dm)
int *vertpa = MEM_callocN(sizeof(int)*totvert,"explode_vertpa2"); int *vertpa = MEM_callocN(sizeof(int)*totvert,"explode_vertpa2");
int *facepa = emd->facepa; int *facepa = emd->facepa;
int *fs, totesplit=0,totfsplit=0,curdupface=0; int *fs, totesplit=0,totfsplit=0,curdupface=0;
int i,j,v1,v2,v3,v4,esplit, v[4], uv[4]; int i,j,v1,v2,v3,v4,esplit,
v[4] = {0, 0, 0, 0}, /* To quite gcc barking... */
uv[4] = {0, 0, 0, 0}; /* To quite gcc barking... */
int numlayer; int numlayer;
edgehash= BLI_edgehash_new(); edgehash= BLI_edgehash_new();