diff options
Diffstat (limited to 'source/blender/blenkernel/intern/context.c')
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 9e9a0ca2d54..05c56fa8101 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -381,7 +381,8 @@ void CTX_wm_window_set(bContext *C, wmWindow *win) { C->wm.window= win; C->wm.screen= (win)? win->screen: NULL; - C->data.scene= (C->wm.screen)? C->wm.screen->scene: NULL; + if(C->wm.screen) + C->data.scene= C->wm.screen->scene; C->wm.area= NULL; C->wm.region= NULL; } @@ -389,7 +390,8 @@ void CTX_wm_window_set(bContext *C, wmWindow *win) void CTX_wm_screen_set(bContext *C, bScreen *screen) { C->wm.screen= screen; - C->data.scene= (C->wm.screen)? C->wm.screen->scene: NULL; + if(C->wm.screen) + C->data.scene= C->wm.screen->scene; C->wm.area= NULL; C->wm.region= NULL; } |