Depsgraph: Make dependency graph to be built from scene layer

This is a final step of having proper ownership. Now selecting different
layers in the "top bar" will actually do what this is expected to do.

Surely, there are still things to be done under the hood, that will happen
in a less intrusive way.

2 files changed, 15 insertions, 10 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);
 							}
 						}
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index ee2d9553c60..d98d66f178d 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -3240,7 +3240,8 @@ static const EnumPropertyItem redraw_timer_type_items[] = {
 
 
 static void redraw_timer_step(
-        bContext *C, Main *bmain, Scene *scene, struct Depsgraph *depsgraph,
+        bContext *C, Main *bmain, Scene *scene, SceneLayer *scene_layer,
+        struct Depsgraph *depsgraph,
         wmWindow *win, ScrArea *sa, ARegion *ar,
         const int type, const int cfra)
 {
@@ -3287,7 +3288,7 @@ static void redraw_timer_step(
 	}
 	else if (type == eRTAnimationStep) {
 		scene->r.cfra += (cfra == scene->r.cfra) ? 1 : -1;
-		BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene);
+		BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer);
 	}
 	else if (type == eRTAnimationPlay) {
 		/* play anim, return on same frame as started with */
@@ -3299,7 +3300,7 @@ static void redraw_timer_step(
 			if (scene->r.cfra > scene->r.efra)
 				scene->r.cfra = scene->r.sfra;
 
-			BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene);
+			BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene, scene_layer);
 			redraw_timer_window_swap(C);
 		}
 	}
@@ -3313,6 +3314,7 @@ static int redraw_timer_exec(bContext *C, wmOperator *op)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
 	wmWindow *win = CTX_wm_window(C);
 	ScrArea *sa = CTX_wm_area(C);
 	ARegion *ar = CTX_wm_region(C);
@@ -3330,7 +3332,7 @@ static int redraw_timer_exec(bContext *C, wmOperator *op)
 	time_start = PIL_check_seconds_timer();
 
 	for (a = 0; a < iter; a++) {
-		redraw_timer_step(C, bmain, scene, depsgraph, win, sa, ar, type, cfra);
+		redraw_timer_step(C, bmain, scene, scene_layer, depsgraph, win, sa, ar, type, cfra);
 		iter_steps += 1;
 
 		if (time_limit != 0.0) {