diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-01 19:26:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-01 19:26:48 +0400 |
| commit | 7d1da8b60a5c404a263267477707455bcb7f3c3f (patch) | |
| tree | b8a1c8cdf710c9a839f1703c23cc92e918f1a5b6 | |
| parent | 71499c16da307b451ff5484a28018a5cd9349f16 (diff) | |
fix for unlikely crash if smoke collision data couldn't be read. (pointer was used before doing NULL check)
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 38d6254b613..80943c2858b 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4368,13 +4368,14 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb) smd->flow = NULL; smd->domain = NULL; smd->coll = newdataadr(fd, smd->coll); - smd->coll->smd = smd; if (smd->coll) { + smd->coll->smd = smd; smd->coll->points = NULL; smd->coll->numpoints = 0; } - else + else { smd->type = 0; + } } } else if (md->type == eModifierType_DynamicPaint) { |