diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-13 03:19:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-13 03:19:08 +0400 |
| commit | f66d11cf7770fdfe5e473630d4964ecacaaa0348 (patch) | |
| tree | 410f3683f81f78740cf54766d982d4d093bb8ae5 /source | |
| parent | 0a0074f9c65255dfa7b5bca67abe149b7d74e797 (diff) | |
fix for missing NULL check in own recent commit, thanks Gaia for pointing this out.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/object/object_bake.c | 8 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_particleinstance.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index c0dd911946b..f9b73a56403 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -1377,9 +1377,11 @@ static void finish_bake_internal(BakeRender *bkr) } /* freed when baking is done, but if its canceled we need to free here */ - if (ibuf->userdata) { - MEM_freeN(ibuf->userdata); - ibuf->userdata = NULL; + if (ibuf) { + if (ibuf->userdata) { + MEM_freeN(ibuf->userdata); + ibuf->userdata = NULL; + } } } } diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index d46ef3c3fc4..e64e80efde3 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -152,7 +152,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, MPoly *mpoly, *orig_mpoly; MLoop *mloop, *orig_mloop; MVert *mvert, *orig_mvert; - int totvert, totpoly, totloop, totedge; + int totvert, totpoly, totloop /* , totedge */; int maxvert, maxpoly, maxloop, totpart = 0, first_particle = 0; int k, p, p_skip; short track = ob->trackflag % 3, trackneg, axis = pimd->axis; @@ -210,7 +210,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, totvert = dm->getNumVerts(dm); totpoly = dm->getNumPolys(dm); totloop = dm->getNumLoops(dm); - totedge = dm->getNumEdges(dm); + /* totedge = dm->getNumEdges(dm); */ /* UNUSED */ /* count particles */ maxvert = 0; |