[Bf-blender-cvs] [607d916] master: Fix T47632: Revert "Fix (unreported) crash when opening a file from splash screen when 'load UI' option is disabled."
Bastien Montagne
noreply at git.blender.org
Tue Mar 1 12:45:33 CET 2016
Commit: 607d916f503a13d542cfa65c4ff505e913679df7
Author: Bastien Montagne
Date: Tue Mar 1 11:47:33 2016 +0100
Branches: master
https://developer.blender.org/rB607d916f503a13d542cfa65c4ff505e913679df7
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.
===================================================================
M source/blender/blenkernel/intern/context.c
===================================================================
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 7567033..5b76985 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)
More information about the Bf-blender-cvs
mailing list