[Bf-blender-cvs] [65c86fc66b] fracture_modifier: load crash fix if FM is there but hasnt been executed prior to save

[Martin Felke]

Commit: 65c86fc66bb4bd02f33dae112ec94260e06901d8
Author: Martin Felke
Date:   Wed Mar 15 20:55:42 2017 +0100
Branches: fracture_modifier
https://developer.blender.org/rB65c86fc66bb4bd02f33dae112ec94260e06901d8

load crash fix if FM is there but hasnt been executed prior to save

===================================================================

M	source/blender/blenloader/intern/readfile.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ab142ab42c..54be9f0441 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5212,8 +5212,10 @@ static void load_fracture_modifier(FileData* fd, FractureModifierData *fmd)
 	bool autoexec = false;
 
 	fm = fmd->frac_mesh = newdataadr(fd, fmd->frac_mesh);
-	fm->last_expected_shards = 0;
-	fm->progress_counter = 0;
+	if (fm) {
+		fm->last_expected_shards = 0;
+		fm->progress_counter = 0;
+	}
 
 	autoexec = fmd->auto_execute;
 	fmd->auto_execute = false;