diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-02-11 16:30:52 +0300 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-02-11 16:30:52 +0300 |
commit | 69e6a6cbc9cfdae6804d538cb4810672c5318d48 (patch) | |
tree | fba0fd9d8cd075d85e0548dc8c69aad7f2078fdc /source/blender/src/header_info.c | |
parent | fdbfd7e3a8df163fd8773d86c9344ddff30c14ed (diff) |
Pointcache: Fixed non-availability when blend file was loaded from command line and also another case where you startet from an unsaved blend and switched to a saved one; Cloth: Fixid mass init, little speedup for collisions; Collision Modifier: More generalized it
Diffstat (limited to 'source/blender/src/header_info.c')
-rw-r--r-- | source/blender/src/header_info.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index 4559d5c460b..be89b15a615 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -861,14 +861,19 @@ static void do_info_filemenu(void *arg, int event) case 15: /* recover previous session */ { extern short winqueue_break; /* editscreen.c */ - int save_over; + int save_over, retval = 0; char str[FILE_MAXDIR+FILE_MAXFILE]; char scestr[FILE_MAXDIR+FILE_MAXFILE]; strcpy(scestr, G.sce); /* temporal store */ save_over = G.save_over; BLI_make_file_string("/", str, U.tempdir, "quit.blend"); - BKE_read_file(str, NULL); + retval = BKE_read_file(str, NULL); + + /*we successfully loaded a blend file, get sure that + pointcache works */ + if (retval!=0) G.relbase_valid = 1; + G.save_over = save_over; strcpy(G.sce, scestr); |