From 9b16b105f145f16703d83c70991a47069ee5a742 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 23 Jul 2013 18:30:06 +0000 Subject: [PATCH] avoid calling context functions when direct access is possible. --- source/blender/editors/screen/screen_ops.c | 2 +- source/blender/windowmanager/intern/wm_event_system.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index ff2561dc66f..93ccc4f6a09 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3184,7 +3184,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv sound_seek_scene(bmain, scene); /* since we follow drawflags, we can't send notifier but tag regions ourselves */ - ED_update_for_newframe(CTX_data_main(C), scene, 1); + ED_update_for_newframe(bmain, scene, 1); for (window = wm->windows.first; window; window = window->next) { for (sa = window->screen->areabase.first; sa; sa = sa->next) { diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index f8546ad441a..c33e67e00bd 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -274,7 +274,7 @@ void wm_event_do_notifiers(bContext *C) } if (note->window == win || - (note->window == NULL && (note->reference == NULL || note->reference == CTX_data_scene(C)))) + (note->window == NULL && (note->reference == NULL || note->reference == win->screen->scene))) { if (note->category == NC_SCENE) { if (note->data == ND_FRAME) @@ -282,7 +282,7 @@ void wm_event_do_notifiers(bContext *C) } } if (ELEM5(note->category, NC_SCENE, NC_OBJECT, NC_GEOM, NC_SCENE, NC_WM)) { - ED_info_stats_clear(CTX_data_scene(C)); + ED_info_stats_clear(win->screen->scene); WM_event_add_notifier(C, NC_SPACE | ND_SPACE_INFO, NULL); } }