From a978c122ee76ea947d55dda50a2dc97ae3ff8457 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Wed, 24 Aug 2005 20:26:28 +0000 Subject: [PATCH] Making compiler happy; - removed unused variables - #if 0 around unused calls - init of uninitialized vars --- source/blender/blenkernel/intern/DerivedMesh.c | 1 - source/blender/blenkernel/intern/subsurf_ccg.c | 4 ++-- source/blender/src/editmesh.c | 3 ++- source/blender/src/editmesh_add.c | 2 -- source/blender/src/editmesh_mods.c | 1 - source/blender/src/editmesh_tools.c | 6 +++--- source/blender/src/transform_conversions.c | 1 - 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 16882eb91a5..5459277c379 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -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; diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 38be3d13cbd..11cce79c7fc 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -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"); diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c index e6c0ed1fad8..6828de7ef02 100644 --- a/source/blender/src/editmesh.c +++ b/source/blender/src/editmesh.c @@ -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; diff --git a/source/blender/src/editmesh_add.c b/source/blender/src/editmesh_add.c index d028abf6931..2d402b0a5f6 100644 --- a/source/blender/src/editmesh_add.c +++ b/source/blender/src/editmesh_add.c @@ -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); diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c index c719f1bcd83..a260b150c29 100644 --- a/source/blender/src/editmesh_mods.c +++ b/source/blender/src/editmesh_mods.c @@ -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) { diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index 472b1375da5..8d4c0f5d54a 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -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 |---*-----*---| | * / | * \ / | - | /* | + | * | | / \ | * \ | | \ | diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c index a54b83bea0b..fe844ca7e5a 100755 --- a/source/blender/src/transform_conversions.c +++ b/source/blender/src/transform_conversions.c @@ -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;