Making compiler happy;

- removed unused variables
- #if 0 around unused calls
- init of uninitialized vars
This commit is contained in:
Ton Roosendaal
2005-08-24 20:26:28 +00:00
parent dfb654ba60
commit a978c122ee
7 changed files with 7 additions and 11 deletions

View File

@@ -234,7 +234,6 @@ static void meshDM_drawLooseEdges(DerivedMesh *dm)
{
MeshDerivedMesh *mdm = (MeshDerivedMesh*) dm;
Mesh *me= mdm->me;
MFace *mface = me->mface;
MEdge *medge= me->medge;
int i;

View File

@@ -194,6 +194,7 @@ static int getFaceIndex(CCGSubSurf *ss, CCGFace *f, int S, int x, int y, int edg
}
}
#if 0
static unsigned int ss_getEdgeFlags(CCGSubSurf *ss, CCGEdge *e, int ssFromEditmesh, DispListMesh *dlm, MEdge *medge, TFace *tface)
{
unsigned int flags = 0;
@@ -209,8 +210,6 @@ static unsigned int ss_getEdgeFlags(CCGSubSurf *ss, CCGEdge *e, int ssFromEditme
flags |= ME_SEAM;
}
} else {
int makeFlags = 0, edgeIdx = (int) ccgSubSurf_getEdgeEdgeHandle(ss, e);
if (edgeIdx!=-1) {
MEdge *origMed = &medge[edgeIdx];
@@ -224,6 +223,7 @@ static unsigned int ss_getEdgeFlags(CCGSubSurf *ss, CCGEdge *e, int ssFromEditme
return flags;
}
#endif
static DispListMesh *ss_to_displistmesh(CCGSubSurf *ss, CCGDerivedMesh *ccgdm, int ssFromEditmesh, int drawInteriorEdges, Mesh *inMe, DispListMesh *inDLM) {
DispListMesh *dlm = MEM_callocN(sizeof(*dlm), "dlm");

View File

@@ -582,6 +582,7 @@ static void edge_normal_compare(EditEdge *eed, EditFace *efa1)
if(inp < -0.001 ) eed->f1= 1;
}
#if 0
typedef struct {
EditEdge *eed;
float noLen,no[3];
@@ -597,6 +598,7 @@ static int edgeDrawFlagInfo_cmp(const void *av, const void *bv)
else if (a->noLen>b->noLen) return 1;
else return 0;
}
#endif
static void edge_drawflags(void)
{
@@ -701,7 +703,6 @@ static void edge_drawflags(void)
/* turns Mesh into editmesh */
void make_editMesh()
{
EditMesh *em = G.editMesh;
Mesh *me= G.obedit->data;
MFace *mface;
TFace *tface;

View File

@@ -263,8 +263,6 @@ static void make_fgon(void)
error("Didn't find FGon to create");
}
else {
Mesh *me= G.obedit->data;
EM_fgon_flags(); // redo flags and indices for fgons
allqueue(REDRAWVIEW3D, 0);

View File

@@ -1789,7 +1789,6 @@ void editmesh_mark_seam(int clear)
{
EditMesh *em= G.editMesh;
EditEdge *eed;
Mesh *me= G.obedit->data;
/* auto-enable seams drawing */
if(clear==0) {

View File

@@ -1646,7 +1646,7 @@ static void fill_quad_double_adj_path(EditFace *efa, struct GHash *gh, int numcu
static void fill_quad_double_adj_fan(EditFace *efa, struct GHash *gh, int numcuts)
{
EditEdge *cedge[2]={NULL, NULL};
EditVert *v[4], *op, **verts[2];
EditVert *v[4], *op=NULL, **verts[2];
EditFace *hold;
short start=0, start2=0, vertsize,i;
@@ -1709,7 +1709,7 @@ static void fill_quad_double_adj_fan(EditFace *efa, struct GHash *gh, int numcut
static void fill_quad_double_adj_inner(EditFace *efa, struct GHash *gh, int numcuts)
{
EditEdge *cedge[2]={NULL, NULL};
EditVert *v[4], *op, **verts[2],**inner;
EditVert *v[4], *op=NULL, **verts[2],**inner;
EditFace *hold;
short start=0, start2=0, vertsize,i;
float co[3];
@@ -1754,7 +1754,7 @@ static void fill_quad_double_adj_inner(EditFace *efa, struct GHash *gh, int numc
|---*-----*---|
| * / |
* \ / |
| /* |
| * |
| / \ |
* \ |
| \ |

View File

@@ -315,7 +315,6 @@ static void createTransEdge(TransInfo *t) {
TransData *td = NULL;
EditMesh *em = G.editMesh;
EditEdge *eed;
Mesh *me = G.obedit->data;
float mtx[3][3], smtx[3][3];
int count=0, countsel=0;
int propmode = t->flag & T_PROP_EDIT;