Remove scene layer and collection from context

2 files changed, 8 insertions, 33 deletions

diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 70f9fa3dfc4..649d142d1cd 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -251,8 +251,6 @@ int CTX_data_mode_enum(const bContext *C);
 
 void CTX_data_main_set(bContext *C, struct Main *bmain);
 void CTX_data_scene_set(bContext *C, struct Scene *bmain);
-void CTX_data_scene_collection_set(bContext *C, struct SceneCollection *sc);
-void CTX_data_scene_layer_set(bContext *C, struct SceneLayer *sl);
 
 int CTX_data_selected_editable_objects(const bContext *C, ListBase *list);
 int CTX_data_selected_editable_bases(const bContext *C, ListBase *list);
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 592adfc578a..f31b844155e 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -79,8 +79,6 @@ struct bContext {
 	struct {
 		struct Main *main;
 		struct Scene *scene;
-		struct SceneLayer *render_layer;
-		struct SceneCollection *scene_collection;
 
 		int recursion;
 		int py_init; /* true if python is initialized */
@@ -908,7 +906,10 @@ SceneLayer *CTX_data_scene_layer(const bContext *C)
 		return sl;
 	}
 	else {
-		return C->data.render_layer;
+		Scene *scene = CTX_data_scene(C);
+		/* temporary, waiting for workspace or scene active layer */
+		TODO_LAYER_CONTEXT;
+		return scene->render_layers.last;
 	}
 }
 
@@ -928,15 +929,11 @@ SceneCollection *CTX_data_scene_collection(const bContext *C)
 		if (BKE_scene_layer_has_collection(sl, sc)) {
 			return sc;
 		}
-		else {
-			/* fallback */
-			LayerCollection *lc = BKE_layer_collection_active(sl);
-			return lc->scene_collection;
-		}
-	}
-	else {
-		return C->data.scene_collection;
 	}
+
+	/* fallback */
+	LayerCollection *lc = BKE_layer_collection_active(sl);
+	return lc->scene_collection;
 }
 
 int CTX_data_mode_enum(const bContext *C)
@@ -1005,26 +1002,6 @@ const char *CTX_data_mode_string(const bContext *C)
 void CTX_data_scene_set(bContext *C, Scene *scene)
 {
 	C->data.scene = scene;
-	TODO_LAYER_CONTEXT
-
-	/* render_layer comes from workspace (or even viewport) actually
-	 * this is only while we wait for workspace changes to be merged
-	 */
-	CTX_data_scene_layer_set(C, scene->render_layers.last);
-}
-
-void CTX_data_scene_collection_set(bContext *C, SceneCollection *sc)
-{
-	C->data.scene_collection = sc;
-}
-
-void CTX_data_scene_layer_set(bContext *C, SceneLayer *sl)
-{
-	C->data.render_layer = sl;
-
-	/* update the related data */
-	LayerCollection *lc = BKE_layer_collection_active(sl);
-	CTX_data_scene_collection_set(C, lc->scene_collection);
 }
 
 ToolSettings *CTX_data_tool_settings(const bContext *C)