diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-20 19:22:20 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-20 19:22:20 +0400 |
commit | b3938cee638101df97e056cdf19891be84340142 (patch) | |
tree | fc57978bf6458c3200d016cef12a8ca661f3334a /source/blender | |
parent | 9c03a8ca77c9e6663aad7e11f74bc4fc59838590 (diff) |
minor warning/fixes
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/modifiers_bmesh.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 10 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_construct.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 3 | ||||
-rw-r--r-- | source/blender/bmesh/operators/primitiveops.c | 5 | ||||
-rw-r--r-- | source/blender/editors/mesh/editbmesh_bvh.c | 4 |
6 files changed, 14 insertions, 19 deletions
diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index 2f011c66a9f..cf6d7b87fe3 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -118,7 +118,6 @@ BMEditMesh *CDDM_To_BMesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing) BMIter liter; BLI_array_declare(verts); BLI_array_declare(edges); - int numTex, numCol; int i, j, k, totvert, totedge, totface; if (em) bm = em->bm; @@ -132,10 +131,6 @@ BMEditMesh *CDDM_To_BMesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing) CustomData_bmesh_merge(&dm->loopData, &bm->ldata, CD_MASK_DERIVEDMESH, CD_CALLOC, bm, BM_LOOP); CustomData_bmesh_merge(&dm->polyData, &bm->pdata, CD_MASK_DERIVEDMESH, CD_CALLOC, bm, BM_FACE); - /*needed later*/ - numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY); - numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL); - totvert = dm->getNumVerts(dm); totedge = dm->getNumEdges(dm); totface = dm->getNumPolys(dm); diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 5c13c2c52fe..ba32e1ddac0 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -918,7 +918,7 @@ static void multiresModifier_update(DerivedMesh *dm) void multires_set_space(DerivedMesh *dm, Object *ob, int from, int to) { - DerivedMesh *ccgdm, *subsurf=NULL; + DerivedMesh *ccgdm = NULL, *subsurf = NULL; DMGridData **gridData, **subGridData=NULL; MPoly *mpoly = CustomData_get_layer(&dm->polyData, CD_MPOLY); MDisps *mdisps; @@ -1031,9 +1031,11 @@ cleanup: subsurf->needsFree = 1; subsurf->release(subsurf); } - - ccgdm->needsFree = 1; - ccgdm->release(ccgdm); + + if (ccgdm) { + ccgdm->needsFree = 1; + ccgdm->release(ccgdm); + } } void multires_stitch_grids(Object *ob) diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 3488472c010..20003942023 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -472,7 +472,7 @@ BMesh *BM_Copy_Mesh(BMesh *bmold) BMFace *f, *f2, **ftable = NULL; BMEditSelection *ese; BMIter iter, liter; - int allocsize[4] = {512,512,2048,512}, numTex, numCol; + int allocsize[4] = {512,512,2048,512}; int i, j; /*allocate a bmesh*/ @@ -488,10 +488,6 @@ BMesh *BM_Copy_Mesh(BMesh *bmold) CustomData_bmesh_init_pool(&bm->ldata, allocsize[2]); CustomData_bmesh_init_pool(&bm->pdata, allocsize[3]); - /*needed later*/ - numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY); - numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL); - vtable= MEM_mallocN(sizeof(BMVert *) * bmold->totvert, "BM_Copy_Mesh vtable"); etable= MEM_mallocN(sizeof(BMEdge *) * bmold->totedge, "BM_Copy_Mesh etable"); ftable= MEM_mallocN(sizeof(BMFace *) * bmold->totface, "BM_Copy_Mesh ftable"); diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 663a1ae81f2..4d2dd58c23c 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -225,7 +225,8 @@ float BM_Compute_Face_Area(BMesh *bm, BMFace *f) BMLoop *l; BMIter iter; float (*verts)[3]; - float area, center[3]; + float center[3]; + float area = 0.0f; int i; BLI_array_fixedstack_declare(verts, BM_NGON_STACK_SIZE, f->len, __func__); diff --git a/source/blender/bmesh/operators/primitiveops.c b/source/blender/bmesh/operators/primitiveops.c index d177d430add..d78e0e1c18a 100644 --- a/source/blender/bmesh/operators/primitiveops.c +++ b/source/blender/bmesh/operators/primitiveops.c @@ -279,7 +279,7 @@ void bmesh_create_grid_exec(BMesh *bm, BMOperator *op) void bmesh_create_uvsphere_exec(BMesh *bm, BMOperator *op) { BMOperator bmop, prevop; - BMVert *eve, *preveve, *v1; + BMVert *eve, *preveve; BMEdge *e; BMIter iter; float vec[3], mat[4][4], cmat[3][3], phi, q[4]; @@ -302,8 +302,7 @@ void bmesh_create_uvsphere_exec(BMesh *bm, BMOperator *op) eve= BM_Make_Vert(bm, vec, NULL); BMO_SetFlag(bm, eve, VERT_MARK); - if(a==0) v1= eve; - else { + if(a != 0) { e = BM_Make_Edge(bm, preveve, eve, NULL, 0); BMO_SetFlag(bm, e, EDGE_ORIG); } diff --git a/source/blender/editors/mesh/editbmesh_bvh.c b/source/blender/editors/mesh/editbmesh_bvh.c index d5fab72c24c..e7eef548d3c 100644 --- a/source/blender/editors/mesh/editbmesh_bvh.c +++ b/source/blender/editors/mesh/editbmesh_bvh.c @@ -358,7 +358,8 @@ typedef struct walklist { BMEdge *cure; } walklist; - +/* UNUSED */ +#if 0 static short winding(float *v1, float *v2, float *v3) /* is v3 to the right of v1-v2 ? With exception: v3==v1 || v3==v2 */ { @@ -374,6 +375,7 @@ static short winding(float *v1, float *v2, float *v3) } return 1; } +#endif #if 0 //BMESH_TODO: not implemented yet int BMBVH_VertVisible(BMBVHTree *tree, BMEdge *e, RegionView3D *r3d) |