diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-24 19:08:33 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-24 19:08:33 +0300 |
| commit | 7098c1b93cf8c4c32110781fcf87ffb0cea896e8 (patch) | |
| tree | 11b15b07f90beedae43e1e97935229c8f5c1d021 /source/blender/blenkernel/intern/cdderivedmesh.c | |
| parent | 1159bc9189e99a54b864d41825b640661c1a4c41 (diff) | |
Fix for a recent bugfix, could crash automatic vertex weighting,
forgot to do NULL pointer check.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 3dc2fef4f73..c2946bb666f 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -755,7 +755,7 @@ DerivedMesh *CDDM_from_mesh(Mesh *mesh, Object *ob) DM_init(dm, mesh->totvert, mesh->totedge, mesh->totface); dm->deformedOnly = 1; - if(ob->fluidsimSettings && ob->fluidsimSettings->meshSurface) + if(ob && ob->fluidsimSettings && ob->fluidsimSettings->meshSurface) alloctype= CD_DUPLICATE; else alloctype= CD_REFERENCE; |