diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-14 13:46:26 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-14 13:46:26 +0400 |
commit | 7ad8e5b6f87fbee78d6676e33b80be9cfc74feea (patch) | |
tree | 0cfe1387283a67633ca8f54d2bac20095096f5c2 /source/blender/windowmanager | |
parent | a305a7293923bb9221c37c1c7bb22106e8d9d182 (diff) |
Fix #22816: crash in depsgraph loading some 2.49 files, tagging objects for
update on load should be done later because it's not known yet which scene
is used with which layers visible before the windows are created.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 19a20a13345..8a05e6c4916 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -61,6 +61,7 @@ #include "BKE_blender.h" #include "BKE_context.h" +#include "BKE_depsgraph.h" #include "BKE_DerivedMesh.h" #include "BKE_exotic.h" #include "BKE_font.h" @@ -309,7 +310,9 @@ void WM_read_file(bContext *C, char *name, ReportList *reports) // refresh_interface_font(); CTX_wm_window_set(C, CTX_wm_manager(C)->windows.first); + ED_editors_init(C); + DAG_on_load_update(); #ifndef DISABLE_PYTHON /* run any texts that were loaded in and flagged as modules */ @@ -389,6 +392,7 @@ int WM_read_homefile(bContext *C, wmOperator *op) BKE_write_undo(C, "original"); /* save current state */ ED_editors_init(C); + DAG_on_load_update(); WM_event_add_notifier(C, NC_WM|ND_FILEREAD, NULL); CTX_wm_window_set(C, NULL); /* exits queues */ |