archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T65806: Can't Access bpy.context inside Application Timer

Browse Source 
Sound synchronization was messing a bit with the context, for, actually,
no reason.

Use more direct queries rather than relying on a context there.
This commit is contained in:
Sergey Sharybin
2019-06-20 10:28:52 +02:00
parent 5dcabc4d57
commit a4c907af77
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3230,14 +3230,11 @@ void wm_event_do_handlers(bContext *C)
}
else {
Scene *scene = WM_window_get_active_scene(win);
ViewLayer *view_layer = WM_window_get_active_view_layer(win);
Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, false);
Scene *scene_eval = (depsgraph != NULL) ? DEG_get_evaluated_scene(depsgraph) : NULL;
CTX_wm_window_set(C, win);
CTX_data_scene_set(C, scene);
Depsgraph *depsgraph = CTX_data_depsgraph(C);
Scene *scene_eval = DEG_get_evaluated_scene_if_exists(depsgraph);
if (scene_eval) {
if (scene_eval != NULL) {
const int is_playing_sound = BKE_sound_scene_playing(scene_eval);
if (is_playing_sound != -1) {
@@ -3263,10 +3260,6 @@ void wm_event_do_handlers(bContext *C)
}
}
}
CTX_data_scene_set(C, NULL);
CTX_wm_screen_set(C, NULL);
CTX_wm_window_set(C, NULL);
}
while ((event = win->queue.first)) {