diff options
author | Ton Roosendaal <ton@blender.org> | 2010-11-22 14:21:33 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2010-11-22 14:21:33 +0300 |
commit | 0191c2f7764a951d3bd996dfd5e47a6c0b8b56c0 (patch) | |
tree | 33b33749f87de6b5c41711772ac877827f3a87d1 /source/blender/blenkernel | |
parent | f781780cc043bc26f70c89d1292215f0491d30dc (diff) |
Reverting fix for yesterday's commit that broke Undo.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 9c748565c1a..e1e4f3b15ac 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -237,13 +237,12 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, const char *filename } /* free G.main Main database */ - CTX_wm_manager_set(C, NULL); +// CTX_wm_manager_set(C, NULL); clear_global(); G.main= bfd->main; CTX_data_main_set(C, G.main); - CTX_wm_manager_set(C, G.main->wm.first); if (bfd->user) { |