1 files changed, 9 insertions, 6 deletions

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 7701e501591..ffe417487d7 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -389,8 +389,8 @@ void wm_event_do_notifiers(bContext *C)
 				}
 			}
 			if (ELEM(note->category, NC_SCENE, NC_OBJECT, NC_GEOM, NC_WM)) {
-				SceneLayer *sl = CTX_data_scene_layer(C);
-				ED_info_stats_clear(sl);
+				SceneLayer *scene_layer = CTX_data_scene_layer(C);
+				ED_info_stats_clear(scene_layer);
 				WM_event_add_notifier(C, NC_SPACE | ND_SPACE_INFO, NULL);
 			}
 		}
@@ -400,9 +400,10 @@ void wm_event_do_notifiers(bContext *C)
 			 * collide (happens on slow scenes), BKE_scene_graph_update_for_newframe can be called
 			 * twice which can depgraph update the same object at once */
 			if (G.is_rendering == false) {
-
 				/* depsgraph gets called, might send more notifiers */
-				ED_update_for_newframe(CTX_data_main(C), scene, CTX_data_depsgraph(C));
+				SceneLayer *scene_layer = CTX_data_scene_layer(C);
+				Depsgraph *depsgraph = CTX_data_depsgraph(C);
+				ED_update_for_newframe(CTX_data_main(C), scene, scene_layer, depsgraph);
 			}
 		}
 	}
@@ -2599,7 +2600,7 @@ void wm_event_do_handlers(bContext *C)
 			wm_event_free_all(win);
 		else {
 			Scene *scene = WM_window_get_active_scene(win);
-			
+
 			if (scene) {
 				int is_playing_sound = BKE_sound_scene_playing(scene);
 				
@@ -2622,7 +2623,9 @@ void wm_event_do_handlers(bContext *C)
 							int ncfra = time * (float)FPS + 0.5f;
 							if (ncfra != scene->r.cfra) {
 								scene->r.cfra = ncfra;
-								ED_update_for_newframe(CTX_data_main(C), scene, CTX_data_depsgraph(C));
+								SceneLayer *scene_layer = CTX_data_scene_layer(C);
+								Depsgraph *depsgraph = CTX_data_depsgraph(C);
+								ED_update_for_newframe(CTX_data_main(C), scene, scene_layer, depsgraph);
 								WM_event_add_notifier(C, NC_WINDOW, NULL);
 							}
 						}