fix for unlikely crash if smoke collision data couldn't be read. (pointer was used before doing NULL check)

2012-10-01 15:26:48 +00:00
parent 71499c16da
commit 7d1da8b60a
1 changed files with 3 additions and 2 deletions
--- 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) {