Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-01-20 19:22:20 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-01-20 19:22:20 +0400
commitb3938cee638101df97e056cdf19891be84340142 (patch)
treefc57978bf6458c3200d016cef12a8ca661f3334a /source/blender/blenkernel/intern/multires.c
parent9c03a8ca77c9e6663aad7e11f74bc4fc59838590 (diff)
minor warning/fixes
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
-rw-r--r--source/blender/blenkernel/intern/multires.c10
1 files changed, 6 insertions, 4 deletions
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)