sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

avoid calling context functions when direct access is possible.

Browse Source
This commit is contained in:
Campbell Barton 2013-07-23 18:30:06 +00:00
parent 78490c0a7b
commit 9b16b105f1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/screen/screen_ops.c
View File

@ -3184,7 +3184,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv
sound_seek_scene(bmain, scene); sound_seek_scene(bmain, scene);
/* since we follow drawflags, we can't send notifier but tag regions ourselves */ /* 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 (window = wm->windows.first; window; window = window->next) {
for (sa = window->screen->areabase.first; sa; sa = sa->next) { for (sa = window->screen->areabase.first; sa; sa = sa->next) {

4
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -274,7 +274,7 @@ void wm_event_do_notifiers(bContext *C)
} }
if (note->window == win || 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->category == NC_SCENE) {
if (note->data == ND_FRAME) 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)) { 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); WM_event_add_notifier(C, NC_SPACE | ND_SPACE_INFO, NULL);
} }
} }