diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-03-01 13:47:33 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-04 19:11:57 +0300 |
| commit | 01485b389a1ba9cbe383c75239a28aae43b09a9b (patch) | |
| tree | 42ceb83aa3123426659c2778b71b4d9618254be2 | |
| parent | 91457def832bb628f1816460d0e9c01aad95e904 (diff) | |
Fix T47632: Revert "Fix (unreported) crash when opening a file from splash screen when 'load UI' option is disabled."
This reverts commit 935e241fa6ea095493ade5d5403c9ac55c18d5ef.
Issue will be fixed in a more localized way for now (not that nice, since this use-after-free can possibly happen
in other places too, but only safe solution for 2.77).
This commit is to be backported in 2.77.
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 7567033ad4b..5b7698544e0 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -820,7 +820,6 @@ void CTX_wm_manager_set(bContext *C, wmWindowManager *wm) C->wm.screen = NULL; C->wm.area = NULL; C->wm.region = NULL; - C->wm.menu = NULL; } void CTX_wm_window_set(bContext *C, wmWindow *win) @@ -831,7 +830,6 @@ void CTX_wm_window_set(bContext *C, wmWindow *win) C->data.scene = C->wm.screen->scene; C->wm.area = NULL; C->wm.region = NULL; - C->wm.menu = NULL; } void CTX_wm_screen_set(bContext *C, bScreen *screen) @@ -841,20 +839,17 @@ void CTX_wm_screen_set(bContext *C, bScreen *screen) C->data.scene = C->wm.screen->scene; C->wm.area = NULL; C->wm.region = NULL; - C->wm.menu = NULL; } void CTX_wm_area_set(bContext *C, ScrArea *area) { C->wm.area = area; C->wm.region = NULL; - C->wm.menu = NULL; } void CTX_wm_region_set(bContext *C, ARegion *region) { C->wm.region = region; - C->wm.menu = NULL; } void CTX_wm_menu_set(bContext *C, ARegion *menu) |