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/blenkernel | |
parent | 9c03a8ca77c9e6663aad7e11f74bc4fc59838590 (diff) |
minor warning/fixes
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/modifiers_bmesh.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 10 |
2 files changed, 6 insertions, 9 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) |