Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer

12 files changed, 249 insertions, 249 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 60d62b0b39d..1367157c13c 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2707,8 +2707,8 @@ static void editbmesh_build_data(
 static CustomDataMask object_get_datamask(const Scene *scene, Object *ob, bool *r_need_mapping)
 {
 	/* TODO(sergey): Avoid this linear list lookup. */
-	ViewLayer *sl = BKE_view_layer_context_active_PLACEHOLDER(scene);
-	Object *actob = sl->basact ? sl->basact->object : NULL;
+	ViewLayer *view_layer = BKE_view_layer_context_active_PLACEHOLDER(scene);
+	Object *actob = view_layer->basact ? view_layer->basact->object : NULL;
 	CustomDataMask mask = ob->customdata_mask;
 
 	if (r_need_mapping) {
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index e222c189ddb..4993caf14f1 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -666,7 +666,7 @@ static bool camera_frame_fit_calc_from_data(
 /* don't move the camera, just yield the fit location */
 /* r_scale only valid/useful for ortho cameras */
 bool BKE_camera_view_frame_fit_to_scene(
-        Scene *scene, ViewLayer *sl, Object *camera_ob, float r_co[3], float *r_scale)
+        Scene *scene, ViewLayer *view_layer, Object *camera_ob, float r_co[3], float *r_scale)
 {
 	CameraParams params;
 	CameraViewFrameData data_cb;
@@ -677,7 +677,7 @@ bool BKE_camera_view_frame_fit_to_scene(
 	camera_frame_fit_data_init(scene, camera_ob, &params, &data_cb);
 
 	/* run callback on all visible points */
-	BKE_scene_foreach_display_point(scene, sl, camera_to_frame_view_cb, &data_cb);
+	BKE_scene_foreach_display_point(scene, view_layer, camera_to_frame_view_cb, &data_cb);
 
 	return camera_frame_fit_calc_from_data(&params, &data_cb, r_co, r_scale);
 }
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 216c1f3adc4..b9fef2993b6 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -923,10 +923,10 @@ Scene *CTX_data_scene(const bContext *C)
 
 ViewLayer *CTX_data_view_layer(const bContext *C)
 {
-	ViewLayer *sl;
+	ViewLayer *view_layer;
 
-	if (ctx_data_pointer_verify(C, "view_layer", (void *)&sl)) {
-		return sl;
+	if (ctx_data_pointer_verify(C, "view_layer", (void *)&view_layer)) {
+		return view_layer;
 	}
 	else {
 		return BKE_view_layer_from_workspace_get(CTX_data_scene(C), CTX_wm_workspace(C));
@@ -962,17 +962,17 @@ RenderEngineType *CTX_data_engine(const bContext *C)
  */
 LayerCollection *CTX_data_layer_collection(const bContext *C)
 {
-	ViewLayer *sl = CTX_data_view_layer(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	LayerCollection *lc;
 
 	if (ctx_data_pointer_verify(C, "layer_collection", (void *)&lc)) {
-		if (BKE_view_layer_has_collection(sl, lc->scene_collection)) {
+		if (BKE_view_layer_has_collection(view_layer, lc->scene_collection)) {
 			return lc;
 		}
 	}
 
 	/* fallback */
-	return BKE_layer_collection_get_active(sl);
+	return BKE_layer_collection_get_active(view_layer);
 }
 
 SceneCollection *CTX_data_scene_collection(const bContext *C)
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 394075c1792..9e292422019 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -488,7 +488,7 @@ static void scene_setSubframe(Scene *scene, float subframe)
 	scene->r.subframe = subframe;
 }
 
-static int surface_getBrushFlags(DynamicPaintSurface *surface, const ViewLayer *sl)
+static int surface_getBrushFlags(DynamicPaintSurface *surface, const ViewLayer *view_layer)
 {
 	Base *base = NULL;
 	GroupObject *go = NULL;
@@ -500,7 +500,7 @@ static int surface_getBrushFlags(DynamicPaintSurface *surface, const ViewLayer *
 	if (surface->brush_group)
 		go = surface->brush_group->gobject.first;
 	else
-		base = FIRSTBASE(sl);
+		base = FIRSTBASE(view_layer);
 
 	while (base || go) {
 		brushObj = NULL;
@@ -5639,7 +5639,7 @@ static void dynamic_paint_generate_bake_data_cb(void *userdata, const int index)
 	}
 }
 
-static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const ViewLayer *sl, Object *ob)
+static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const ViewLayer *view_layer, Object *ob)
 {
 	PaintSurfaceData *sData = surface->data;
 	PaintBakeData *bData = sData->bData;
@@ -5647,7 +5647,7 @@ static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const Vie
 	int index;
 	bool new_bdata = false;
 	const bool do_velocity_data = ((surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) ||
-	                               (surface_getBrushFlags(surface, sl) & BRUSH_USES_VELOCITY));
+	                               (surface_getBrushFlags(surface, view_layer) & BRUSH_USES_VELOCITY));
 	const bool do_accel_data = (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) != 0;
 
 	int canvasNumOfVerts = dm->getNumVerts(dm);
@@ -5783,7 +5783,7 @@ static int dynamicPaint_doStep(const struct EvaluationContext *eval_ctx, Scene *
 		GroupObject *go = NULL;
 		Object *brushObj = NULL;
 		ModifierData *md = NULL;
-		ViewLayer *sl = eval_ctx->view_layer;
+		ViewLayer *view_layer = eval_ctx->view_layer;
 
 		/* backup current scene frame */
 		int scene_frame = scene->r.cfra;
@@ -5793,7 +5793,7 @@ static int dynamicPaint_doStep(const struct EvaluationContext *eval_ctx, Scene *
 		if (surface->brush_group)
 			go = surface->brush_group->gobject.first;
 		else
-			base = FIRSTBASE(sl);
+			base = FIRSTBASE(view_layer);
 
 		while (base || go) {
 			brushObj = NULL;
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 76132b02716..502ad9c44a7 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -213,17 +213,17 @@ ListBase *pdInitEffectors(
         const struct EvaluationContext *eval_ctx, Scene *scene, Object *ob_src, ParticleSystem *psys_src,
         EffectorWeights *weights, bool for_simulation)
 {
-	ViewLayer *sl;
+	ViewLayer *view_layer;
 	Base *base;
 	unsigned int layer= ob_src->lay;
 	ListBase *effectors = NULL;
 
 	/* eval_ctx is NULL during deg build */
 	if (eval_ctx) {
-		sl = eval_ctx->view_layer;
+		view_layer = eval_ctx->view_layer;
 	}
 	else {
-		sl = BKE_view_layer_context_active_PLACEHOLDER(scene);
+		view_layer = BKE_view_layer_context_active_PLACEHOLDER(scene);
 	}
 	
 	if (weights->group) {
@@ -244,7 +244,7 @@ ListBase *pdInitEffectors(
 		}
 	}
 	else {
-		for (base = FIRSTBASE(sl); base; base = base->next) {
+		for (base = FIRSTBASE(view_layer); base; base = base->next) {
 			if ( base->object->pd && base->object->pd->forcefield )
 				add_object_to_effectors(&effectors, eval_ctx, scene, weights, base->object, ob_src, for_simulation);
 
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 18f80a6964e..cf2a806f8c6 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -57,9 +57,9 @@
 
 /* prototype */
 struct EngineSettingsCB_Type;
-static void layer_collection_free(ViewLayer *sl, LayerCollection *lc);
-static void layer_collection_objects_populate(ViewLayer *sl, LayerCollection *lc, ListBase *objects);
-static LayerCollection *layer_collection_add(ViewLayer *sl, LayerCollection *parent, SceneCollection *sc);
+static void layer_collection_free(ViewLayer *view_layer, LayerCollection *lc);
+static void layer_collection_objects_populate(ViewLayer *view_layer, LayerCollection *lc, ListBase *objects);
+static LayerCollection *layer_collection_add(ViewLayer *view_layer, LayerCollection *parent, SceneCollection *sc);
 static LayerCollection *find_layer_collection_by_scene_collection(LayerCollection *lc, const SceneCollection *sc);
 static IDProperty *collection_engine_settings_create(struct EngineSettingsCB_Type *ces_type, const bool populate);
 static IDProperty *collection_engine_get(IDProperty *root, const int type, const char *engine_name);
@@ -75,9 +75,9 @@ static void object_bases_iterator_next(BLI_Iterator *iter, const int flag);
  */
 ViewLayer *BKE_view_layer_from_scene_get(const Scene *scene)
 {
-	ViewLayer *sl = BLI_findlink(&scene->view_layers, scene->active_view_layer);
-	BLI_assert(sl);
-	return sl;
+	ViewLayer *view_layer = BLI_findlink(&scene->view_layers, scene->active_view_layer);
+	BLI_assert(view_layer);
+	return view_layer;
 }
 
 /**
@@ -140,34 +140,34 @@ ViewLayer *BKE_view_layer_add(Scene *scene, const char *name)
 /**
  * Free (or release) any data used by this ViewLayer.
  */
-void BKE_view_layer_free(ViewLayer *sl)
+void BKE_view_layer_free(ViewLayer *view_layer)
 {
-	sl->basact = NULL;
+	view_layer->basact = NULL;
 
-	for (Base *base = sl->object_bases.first; base; base = base->next) {
+	for (Base *base = view_layer->object_bases.first; base; base = base->next) {
 		if (base->collection_properties) {
 			IDP_FreeProperty(base->collection_properties);
 			MEM_freeN(base->collection_properties);
 		}
 	}
-	BLI_freelistN(&sl->object_bases);
+	BLI_freelistN(&view_layer->object_bases);
 
-	for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) {
+	for (LayerCollection *lc = view_layer->layer_collections.first; lc; lc = lc->next) {
 		layer_collection_free(NULL, lc);
 	}
-	BLI_freelistN(&sl->layer_collections);
+	BLI_freelistN(&view_layer->layer_collections);
 
-	if (sl->properties) {
-		IDP_FreeProperty(sl->properties);
-		MEM_freeN(sl->properties);
+	if (view_layer->properties) {
+		IDP_FreeProperty(view_layer->properties);
+		MEM_freeN(view_layer->properties);
 	}
 
-	if (sl->properties_evaluated) {
-		IDP_FreeProperty(sl->properties_evaluated);
-		MEM_freeN(sl->properties_evaluated);
+	if (view_layer->properties_evaluated) {
+		IDP_FreeProperty(view_layer->properties_evaluated);
+		MEM_freeN(view_layer->properties_evaluated);
 	}
 
-	for (ViewLayerEngineData *sled = sl->drawdata.first; sled; sled = sled->next) {
+	for (ViewLayerEngineData *sled = view_layer->drawdata.first; sled; sled = sled->next) {
 		if (sled->storage) {
 			if (sled->free) {
 				sled->free(sled->storage);
@@ -175,26 +175,26 @@ void BKE_view_layer_free(ViewLayer *sl)
 			MEM_freeN(sled->storage);
 		}
 	}
-	BLI_freelistN(&sl->drawdata);
+	BLI_freelistN(&view_layer->drawdata);
 
-	MEM_SAFE_FREE(sl->stats);
+	MEM_SAFE_FREE(view_layer->stats);
 
-	BKE_freestyle_config_free(&sl->freestyle_config);
+	BKE_freestyle_config_free(&view_layer->freestyle_config);
 
-	if (sl->id_properties) {
-		IDP_FreeProperty(sl->id_properties);
-		MEM_freeN(sl->id_properties);
+	if (view_layer->id_properties) {
+		IDP_FreeProperty(view_layer->id_properties);
+		MEM_freeN(view_layer->id_properties);
 	}
 
-	MEM_freeN(sl);
+	MEM_freeN(view_layer);
 }
 
 /**
  * Tag all the selected objects of a renderlayer
  */
-void BKE_view_layer_selected_objects_tag(ViewLayer *sl, const int tag)
+void BKE_view_layer_selected_objects_tag(ViewLayer *view_layer, const int tag)
 {
-	for (Base *base = sl->object_bases.first; base; base = base->next) {
+	for (Base *base = view_layer->object_bases.first; base; base = base->next) {
 		if ((base->flag & BASE_SELECTED) != 0) {
 			base->object->flag |= tag;
 		}
@@ -240,9 +240,9 @@ Object *BKE_view_layer_camera_find(ViewLayer *view_layer)
  */
 ViewLayer *BKE_view_layer_find_from_collection(const Scene *scene, LayerCollection *lc)
 {
-	for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) {
-		if (find_scene_collection_in_scene_collections(&sl->layer_collections, lc)) {
-			return sl;
+	for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+		if (find_scene_collection_in_scene_collections(&view_layer->layer_collections, lc)) {
+			return view_layer;
 		}
 	}
 	return NULL;
@@ -250,36 +250,36 @@ ViewLayer *BKE_view_layer_find_from_collection(const Scene *scene, LayerCollecti
 
 /* Base */
 
-Base *BKE_view_layer_base_find(ViewLayer *sl, Object *ob)
+Base *BKE_view_layer_base_find(ViewLayer *view_layer, Object *ob)
 {
-	return BLI_findptr(&sl->object_bases, ob, offsetof(Base, object));
+	return BLI_findptr(&view_layer->object_bases, ob, offsetof(Base, object));
 }
 
-void BKE_view_layer_base_deselect_all(ViewLayer *sl)
+void BKE_view_layer_base_deselect_all(ViewLayer *view_layer)
 {
 	Base *base;
 
-	for (base = sl->object_bases.first; base; base = base->next) {
+	for (base = view_layer->object_bases.first; base; base = base->next) {
 		base->flag &= ~BASE_SELECTED;
 	}
 }
 
-void BKE_view_layer_base_select(struct ViewLayer *sl, Base *selbase)
+void BKE_view_layer_base_select(struct ViewLayer *view_layer, Base *selbase)
 {
-	sl->basact = selbase;
+	view_layer->basact = selbase;
 	if ((selbase->flag & BASE_SELECTABLED) != 0) {
 		selbase->flag |= BASE_SELECTED;
 	}
 }
 
-static void view_layer_object_base_unref(ViewLayer *sl, Base *base)
+static void view_layer_object_base_unref(ViewLayer *view_layer, Base *base)
 {
 	base->refcount--;
 
 	/* It only exists in the RenderLayer */
 	if (base->refcount == 0) {
-		if (sl->basact == base) {
-			sl->basact = NULL;
+		if (view_layer->basact == base) {
+			view_layer->basact = NULL;
 		}
 
 		if (base->collection_properties) {
@@ -287,7 +287,7 @@ static void view_layer_object_base_unref(ViewLayer *sl, Base *base)
 			MEM_freeN(base->collection_properties);
 		}
 
-		BLI_remlink(&sl->object_bases, base);
+		BLI_remlink(&view_layer->object_bases, base);
 		MEM_freeN(base);
 	}
 }
@@ -296,17 +296,17 @@ static void view_layer_object_base_unref(ViewLayer *sl, Base *base)
  * Return the base if existent, or create it if necessary
  * Always bump the refcount
  */
-static Base *object_base_add(ViewLayer *sl, Object *ob)
+static Base *object_base_add(ViewLayer *view_layer, Object *ob)
 {
 	Base *base;
-	base = BKE_view_layer_base_find(sl, ob);
+	base = BKE_view_layer_base_find(view_layer, ob);
 
 	if (base == NULL) {
 		base = MEM_callocN(sizeof(Base), "Object Base");
 
 		/* Do not bump user count, leave it for SceneCollections. */
 		base->object = ob;
-		BLI_addtail(&sl->object_bases, base);
+		BLI_addtail(&view_layer->object_bases, base);
 
 		IDPropertyTemplate val = {0};
 		base->collection_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
@@ -318,11 +318,11 @@ static Base *object_base_add(ViewLayer *sl, Object *ob)
 
 /* LayerCollection */
 
-static void layer_collection_objects_unpopulate(ViewLayer *sl, LayerCollection *lc)
+static void layer_collection_objects_unpopulate(ViewLayer *view_layer, LayerCollection *lc)
 {
-	if (sl) {
+	if (view_layer) {
 		for (LinkData *link = lc->object_bases.first; link; link = link->next) {
-			view_layer_object_base_unref(sl, link->data);
+			view_layer_object_base_unref(view_layer, link->data);
 		}
 	}
 
@@ -333,9 +333,9 @@ static void layer_collection_objects_unpopulate(ViewLayer *sl, LayerCollection *
  * When freeing the entire ViewLayer at once we don't bother with unref
  * otherwise ViewLayer is passed to keep the syncing of the LayerCollection tree
  */
-static void layer_collection_free(ViewLayer *sl, LayerCollection *lc)
+static void layer_collection_free(ViewLayer *view_layer, LayerCollection *lc)
 {
-	layer_collection_objects_unpopulate(sl, lc);
+	layer_collection_objects_unpopulate(view_layer, lc);
 	BLI_freelistN(&lc->overrides);
 
 	if (lc->properties) {
@@ -349,7 +349,7 @@ static void layer_collection_free(ViewLayer *sl, LayerCollection *lc)
 	}
 
 	for (LayerCollection *nlc = lc->layer_collections.first; nlc; nlc = nlc->next) {
-		layer_collection_free(sl, nlc);
+		layer_collection_free(view_layer, nlc);
 	}
 
 	BLI_freelistN(&lc->layer_collections);
@@ -359,9 +359,9 @@ static void layer_collection_free(ViewLayer *sl, LayerCollection *lc)
  * Free (or release) LayerCollection from ViewLayer
  * (does not free the LayerCollection itself).
  */
-void BKE_layer_collection_free(ViewLayer *sl, LayerCollection *lc)
+void BKE_layer_collection_free(ViewLayer *view_layer, LayerCollection *lc)
 {
-	layer_collection_free(sl, lc);
+	layer_collection_free(view_layer, lc);
 }
 
 /* LayerCollection */
@@ -389,19 +389,19 @@ static LayerCollection *collection_from_index(ListBase *lb, const int number, in
 /**
  * Get the collection for a given index
  */
-LayerCollection *BKE_layer_collection_from_index(ViewLayer *sl, const int index)
+LayerCollection *BKE_layer_collection_from_index(ViewLayer *view_layer, const int index)
 {
 	int i = 0;
-	return collection_from_index(&sl->layer_collections, index, &i);
+	return collection_from_index(&view_layer->layer_collections, index, &i);
 }
 
 /**
  * Get the active collection
  */
-LayerCollection *BKE_layer_collection_get_active(ViewLayer *sl)
+LayerCollection *BKE_layer_collection_get_active(ViewLayer *view_layer)
 {
 	int i = 0;
-	return collection_from_index(&sl->layer_collections, sl->active_collection, &i);
+	return collection_from_index(&view_layer->layer_collections, view_layer->active_collection, &i);
 }
 
 
@@ -409,17 +409,17 @@ LayerCollection *BKE_layer_collection_get_active(ViewLayer *sl)
  * Return layer collection to add new object(s).
  * Create one if none exists.
  */
-LayerCollection *BKE_layer_collection_get_active_ensure(Scene *scene, ViewLayer *sl)
+LayerCollection *BKE_layer_collection_get_active_ensure(Scene *scene, ViewLayer *view_layer)
 {
-	LayerCollection *lc = BKE_layer_collection_get_active(sl);
+	LayerCollection *lc = BKE_layer_collection_get_active(view_layer);
 
 	if (lc == NULL) {
-		BLI_assert(BLI_listbase_is_empty(&sl->layer_collections));
+		BLI_assert(BLI_listbase_is_empty(&view_layer->layer_collections));
 		/* When there is no collection linked to this ViewLayer, create one. */
 		SceneCollection *sc = BKE_collection_add(scene, NULL, NULL);
-		lc = BKE_collection_link(sl, sc);
+		lc = BKE_collection_link(view_layer, sc);
 		/* New collection has to be the active one. */
-		BLI_assert(lc == BKE_layer_collection_get_active(sl));
+		BLI_assert(lc == BKE_layer_collection_get_active(view_layer));
 	}
 
 	return lc;
@@ -441,9 +441,9 @@ static int collection_count(ListBase *lb)
  * Get the total number of collections
  * (including all the nested collections)
  */
-int BKE_layer_collection_count(ViewLayer *sl)
+int BKE_layer_collection_count(ViewLayer *view_layer)
 {
-	return collection_count(&sl->layer_collections);
+	return collection_count(&view_layer->layer_collections);
 }
 
 /**
@@ -469,10 +469,10 @@ static int index_from_collection(ListBase *lb, const LayerCollection *lc, int *i
 /**
  * Return -1 if not found
  */
-int BKE_layer_collection_findindex(ViewLayer *sl, const LayerCollection *lc)
+int BKE_layer_collection_findindex(ViewLayer *view_layer, const LayerCollection *lc)
 {
 	int i = 0;
-	return index_from_collection(&sl->layer_collections, lc, &i);
+	return index_from_collection(&view_layer->layer_collections, lc, &i);
 }
 
 /**
@@ -534,15 +534,15 @@ static ListBase *scene_collection_listbase_find(ListBase *lb, SceneCollection *s
  */
 
 static void layer_collection_swap(
-        ViewLayer *sl, ListBase *lb_a, ListBase *lb_b,
+        ViewLayer *view_layer, ListBase *lb_a, ListBase *lb_b,
         LayerCollection *lc_a, LayerCollection *lc_b)
 {
 	if (lb_a == NULL) {
-		lb_a = layer_collection_listbase_find(&sl->layer_collections, lc_a);
+		lb_a = layer_collection_listbase_find(&view_layer->layer_collections, lc_a);
 	}
 
 	if (lb_b == NULL) {
-		lb_b = layer_collection_listbase_find(&sl->layer_collections, lc_b);
+		lb_b = layer_collection_listbase_find(&view_layer->layer_collections, lc_b);
 	}
 
 	BLI_assert(lb_a);
@@ -557,10 +557,10 @@ static void layer_collection_swap(
  */
 bool BKE_layer_collection_move_into(const Scene *scene, LayerCollection *lc_dst, LayerCollection *lc_src)
 {
-	ViewLayer *sl = BKE_view_layer_find_from_collection(scene, lc_src);
+	ViewLayer *view_layer = BKE_view_layer_find_from_collection(scene, lc_src);
 	bool is_directly_linked = false;
 
-	if ((!sl) || (sl != BKE_view_layer_find_from_collection(scene, lc_dst))) {
+	if ((!view_layer) || (view_layer != BKE_view_layer_find_from_collection(scene, lc_dst))) {
 		return false;
 	}
 
@@ -578,29 +578,29 @@ bool BKE_layer_collection_move_into(const Scene *scene, LayerCollection *lc_dst,
 	 * but we want to swap it in the layer tree still */
 	if (lc_dst->scene_collection->scene_collections.last == lc_src->scene_collection) {
 		LayerCollection *lc_swap = lc_dst->layer_collections.last;
-		layer_collection_swap(sl, &lc_dst->layer_collections, NULL, lc_dst->layer_collections.last, lc_src);
+		layer_collection_swap(view_layer, &lc_dst->layer_collections, NULL, lc_dst->layer_collections.last, lc_src);
 
-		if (BLI_findindex(&sl->layer_collections, lc_swap) != -1) {
-			BKE_collection_unlink(sl, lc_swap);
+		if (BLI_findindex(&view_layer->layer_collections, lc_swap) != -1) {
+			BKE_collection_unlink(view_layer, lc_swap);
 		}
 		return true;
 	}
 	else {
 		LayerCollection *lc_temp;
-		is_directly_linked = BLI_findindex(&sl->layer_collections, lc_src) != -1;
+		is_directly_linked = BLI_findindex(&view_layer->layer_collections, lc_src) != -1;
 
 		if (!is_directly_linked) {
 			/* lc_src will be invalid after BKE_collection_move_into!
 			 * so we swap it with lc_temp to preserve its settings */
-			lc_temp = BKE_collection_link(sl, lc_src->scene_collection);
-			layer_collection_swap(sl, &sl->layer_collections, NULL, lc_temp, lc_src);
+			lc_temp = BKE_collection_link(view_layer, lc_src->scene_collection);
+			layer_collection_swap(view_layer, &view_layer->layer_collections, NULL, lc_temp, lc_src);
 		}
 
 		if (!BKE_collection_move_into(scene, lc_dst->scene_collection, lc_src->scene_collection)) {
 			if (!is_directly_linked) {
 				/* Swap back and remove */
-				layer_collection_swap(sl, NULL, NULL, lc_temp, lc_src);
-				BKE_collection_unlink(sl, lc_temp);
+				layer_collection_swap(view_layer, NULL, NULL, lc_temp, lc_src);
+				BKE_collection_unlink(view_layer, lc_temp);
 			}
 			return false;
 		}
@@ -608,27 +608,27 @@ bool BKE_layer_collection_move_into(const Scene *scene, LayerCollection *lc_dst,
 
 	LayerCollection *lc_new = BLI_findptr(&lc_dst->layer_collections, lc_src->scene_collection, offsetof(LayerCollection, scene_collection));
 	BLI_assert(lc_new);
-	layer_collection_swap(sl, &lc_dst->layer_collections, NULL, lc_new, lc_src);
+	layer_collection_swap(view_layer, &lc_dst->layer_collections, NULL, lc_new, lc_src);
 
 	/* If it's directly linked, unlink it after the swap */
-	if (BLI_findindex(&sl->layer_collections, lc_new) != -1) {
-		BKE_collection_unlink(sl, lc_new);
+	if (BLI_findindex(&view_layer->layer_collections, lc_new) != -1) {
+		BKE_collection_unlink(view_layer, lc_new);
 	}
 
 	return true;
 }
 
 /**
- * Move \a lc_src above \a lc_dst. Both have to be stored in \a sl.
+ * Move \a lc_src above \a lc_dst. Both have to be stored in \a view_layer.
  * If \a lc_src is directly linked to the ViewLayer it's unlinked
  */
 bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst, LayerCollection *lc_src)
 {
-	ViewLayer *sl = BKE_view_layer_find_from_collection(scene, lc_src);
-	const bool is_directly_linked_src = BLI_findindex(&sl->layer_collections, lc_src) != -1;
-	const bool is_directly_linked_dst = BLI_findindex(&sl->layer_collections, lc_dst) != -1;
+	ViewLayer *view_layer = BKE_view_layer_find_from_collection(scene, lc_src);
+	const bool is_directly_linked_src = BLI_findindex(&view_layer->layer_collections, lc_src) != -1;
+	const bool is_directly_linked_dst = BLI_findindex(&view_layer->layer_collections, lc_dst) != -1;
 
-	if ((!sl) || (sl != BKE_view_layer_find_from_collection(scene, lc_dst))) {
+	if ((!view_layer) || (view_layer != BKE_view_layer_find_from_collection(scene, lc_dst))) {
 		return false;
 	}
 
@@ -641,10 +641,10 @@ bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst
 	 * but we want to swap it in the layer tree still */
 	if (lc_dst->prev && lc_dst->prev->scene_collection == lc_src->scene_collection) {
 		LayerCollection *lc_swap = lc_dst->prev;
-		layer_collection_swap(sl, NULL, NULL, lc_dst->prev, lc_src);
+		layer_collection_swap(view_layer, NULL, NULL, lc_dst->prev, lc_src);
 
-		if (BLI_findindex(&sl->layer_collections, lc_swap) != -1) {
-			BKE_collection_unlink(sl, lc_swap);
+		if (BLI_findindex(&view_layer->layer_collections, lc_swap) != -1) {
+			BKE_collection_unlink(view_layer, lc_swap);
 		}
 		return true;
 	}
@@ -653,8 +653,8 @@ bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst
 	else if (is_directly_linked_dst) {
 		/* Both directly linked to the ViewLayer, just need to swap */
 		if (is_directly_linked_src) {
-			BLI_remlink(&sl->layer_collections, lc_src);
-			BLI_insertlinkbefore(&sl->layer_collections, lc_dst, lc_src);
+			BLI_remlink(&view_layer->layer_collections, lc_src);
+			BLI_insertlinkbefore(&view_layer->layer_collections, lc_dst, lc_src);
 			return true;
 		}
 		else {
@@ -667,15 +667,15 @@ bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst
 		if (!is_directly_linked_src) {
 			/* lc_src will be invalid after BKE_collection_move_into!
 			 * so we swap it with lc_temp to preserve its settings */
-			lc_temp = BKE_collection_link(sl, lc_src->scene_collection);
-			layer_collection_swap(sl, &sl->layer_collections, NULL, lc_temp, lc_src);
+			lc_temp = BKE_collection_link(view_layer, lc_src->scene_collection);
+			layer_collection_swap(view_layer, &view_layer->layer_collections, NULL, lc_temp, lc_src);
 		}
 
 		if (!BKE_collection_move_above(scene, lc_dst->scene_collection, lc_src->scene_collection)) {
 			if (!is_directly_linked_src) {
 				/* Swap back and remove */
-				layer_collection_swap(sl, NULL, NULL, lc_temp, lc_src);
-				BKE_collection_unlink(sl, lc_temp);
+				layer_collection_swap(view_layer, NULL, NULL, lc_temp, lc_src);
+				BKE_collection_unlink(view_layer, lc_temp);
 			}
 			return false;
 		}
@@ -683,11 +683,11 @@ bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst
 
 	LayerCollection *lc_new = lc_dst->prev;
 	BLI_assert(lc_new);
-	layer_collection_swap(sl, NULL, NULL, lc_new, lc_src);
+	layer_collection_swap(view_layer, NULL, NULL, lc_new, lc_src);
 
 	/* If it's directly linked, unlink it after the swap */
-	if (BLI_findindex(&sl->layer_collections, lc_new) != -1) {
-		BKE_collection_unlink(sl, lc_new);
+	if (BLI_findindex(&view_layer->layer_collections, lc_new) != -1) {
+		BKE_collection_unlink(view_layer, lc_new);
 	}
 
 	return true;
@@ -699,11 +699,11 @@ bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst
  */
 bool BKE_layer_collection_move_below(const Scene *scene, LayerCollection *lc_dst, LayerCollection *lc_src)
 {
-	ViewLayer *sl = BKE_view_layer_find_from_collection(scene, lc_src);
-	const bool is_directly_linked_src = BLI_findindex(&sl->layer_collections, lc_src) != -1;
-	const bool is_directly_linked_dst = BLI_findindex(&sl->layer_collections, lc_dst) != -1;
+	ViewLayer *view_layer = BKE_view_layer_find_from_collection(scene, lc_src);
+	const bool is_directly_linked_src = BLI_findindex(&view_layer->layer_collections, lc_src) != -1;
+	const bool is_directly_linked_dst = BLI_findindex(&view_layer->layer_collections, lc_dst) != -1;
 
-	if ((!sl) || (sl != BKE_view_layer_find_from_collection(scene, lc_dst))) {
+	if ((!view_layer) || (view_layer != BKE_view_layer_find_from_collection(scene, lc_dst))) {
 		return false;
 	}
 
@@ -716,10 +716,10 @@ bool BKE_layer_collection_move_below(const Scene *scene, LayerCollection *lc_dst
 	 * but we want to swap it in the layer tree still */
 	if (lc_dst->next && lc_dst->next->scene_collection == lc_src->scene_collection) {
 		LayerCollection *lc_swap = lc_dst->next;
-		layer_collection_swap(sl, NULL, NULL, lc_dst->next, lc_src);
+		layer_collection_swap(view_layer, NULL, NULL, lc_dst->next, lc_src);
 
-		if (BLI_findindex(&sl->layer_collections, lc_swap) != -1) {
-			BKE_collection_unlink(sl, lc_swap);
+		if (BLI_findindex(&view_layer->layer_collections, lc_swap) != -1) {
+			BKE_collection_unlink(view_layer, lc_swap);
 		}
 		return true;
 	}
@@ -728,8 +728,8 @@ bool BKE_layer_collection_move_below(const Scene *scene, LayerCollection *lc_dst
 	else if (is_directly_linked_dst) {
 		/* Both directly linked to the ViewLayer, just need to swap */
 		if (is_directly_linked_src) {
-			BLI_remlink(&sl->layer_collections, lc_src);
-			BLI_insertlinkafter(&sl->layer_collections, lc_dst, lc_src);
+			BLI_remlink(&view_layer->layer_collections, lc_src);
+			BLI_insertlinkafter(&view_layer->layer_collections, lc_dst, lc_src);
 			return true;
 		}
 		else {
@@ -742,15 +742,15 @@ bool BKE_layer_collection_move_below(const Scene *scene, LayerCollection *lc_dst
 		if (!is_directly_linked_src) {
 			/* lc_src will be invalid after BKE_collection_move_into!
 			 * so we swap it with lc_temp to preserve its settings */
-			lc_temp = BKE_collection_link(sl, lc_src->scene_collection);
-			layer_collection_swap(sl, &sl->layer_collections, NULL, lc_temp, lc_src);
+			lc_temp = BKE_collection_link(view_layer, lc_src->scene_collection);
+			layer_collection_swap(view_layer, &view_layer->layer_collections, NULL, lc_temp, lc_src);
 		}
 
 		if (!BKE_collection_move_below(scene, lc_dst->scene_collection, lc_src->scene_collection)) {
 			if (!is_directly_linked_src) {
 				/* Swap back and remove */
-				layer_collection_swap(sl, NULL, NULL, lc_temp, lc_src);
-				BKE_collection_unlink(sl, lc_temp);
+				layer_collection_swap(view_layer, NULL, NULL, lc_temp, lc_src);
+				BKE_collection_unlink(view_layer, lc_temp);
 			}
 			return false;
 		}
@@ -758,17 +758,17 @@ bool BKE_layer_collection_move_below(const Scene *scene, LayerCollection *lc_dst
 
 	LayerCollection *lc_new = lc_dst->next;
 	BLI_assert(lc_new);
-	layer_collection_swap(sl, NULL, NULL, lc_new, lc_src);
+	layer_collection_swap(view_layer, NULL, NULL, lc_new, lc_src);
 
 	/* If it's directly linked, unlink it after the swap */
-	if (BLI_findindex(&sl->layer_collections, lc_new) != -1) {
-		BKE_collection_unlink(sl, lc_new);
+	if (BLI_findindex(&view_layer->layer_collections, lc_new) != -1) {
+		BKE_collection_unlink(view_layer, lc_new);
 	}
 
 	return true;
 }
 
-static bool layer_collection_resync(ViewLayer *sl, LayerCollection *lc, const SceneCollection *sc)
+static bool layer_collection_resync(ViewLayer *view_layer, LayerCollection *lc, const SceneCollection *sc)
 {
 	if (lc->scene_collection == sc) {
 		ListBase collections = {NULL};
@@ -781,12 +781,12 @@ static bool layer_collection_resync(ViewLayer *sl, LayerCollection *lc, const Sc
 				BLI_addtail(&lc->layer_collections, lc_nested);
 			}
 			else {
-				layer_collection_add(sl, lc, sc_nested);
+				layer_collection_add(view_layer, lc, sc_nested);
 			}
 		}
 
 		for (LayerCollection *lc_nested = collections.first; lc_nested; lc_nested = lc_nested->next) {
-			layer_collection_free(sl, lc_nested);
+			layer_collection_free(view_layer, lc_nested);
 		}
 		BLI_freelistN(&collections);
 
@@ -797,7 +797,7 @@ static bool layer_collection_resync(ViewLayer *sl, LayerCollection *lc, const Sc
 	}
 
 	for (LayerCollection *lc_nested = lc->layer_collections.first; lc_nested; lc_nested = lc_nested->next) {
-		if (layer_collection_resync(sl, lc_nested, sc)) {
+		if (layer_collection_resync(view_layer, lc_nested, sc)) {
 			return true;
 		}
 	}
@@ -811,9 +811,9 @@ static bool layer_collection_resync(ViewLayer *sl, LayerCollection *lc, const Sc
  */
 void BKE_layer_collection_resync(const Scene *scene, const SceneCollection *sc)
 {
-	for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) {
-		for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) {
-			layer_collection_resync(sl, lc, sc);
+	for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+		for (LayerCollection *lc = view_layer->layer_collections.first; lc; lc = lc->next) {
+			layer_collection_resync(view_layer, lc, sc);
 		}
 	}
 }
@@ -824,10 +824,10 @@ void BKE_layer_collection_resync(const Scene *scene, const SceneCollection *sc)
  * Link a collection to a renderlayer
  * The collection needs to be created separately
  */
-LayerCollection *BKE_collection_link(ViewLayer *sl, SceneCollection *sc)
+LayerCollection *BKE_collection_link(ViewLayer *view_layer, SceneCollection *sc)
 {
-	LayerCollection *lc = layer_collection_add(sl, NULL, sc);
-	sl->active_collection = BKE_layer_collection_findindex(sl, lc);
+	LayerCollection *lc = layer_collection_add(view_layer, NULL, sc);
+	view_layer->active_collection = BKE_layer_collection_findindex(view_layer, lc);
 	return lc;
 }
 
@@ -835,23 +835,23 @@ LayerCollection *BKE_collection_link(ViewLayer *sl, SceneCollection *sc)
  * Unlink a collection base from a renderlayer
  * The corresponding collection is not removed from the master collection
  */
-void BKE_collection_unlink(ViewLayer *sl, LayerCollection *lc)
+void BKE_collection_unlink(ViewLayer *view_layer, LayerCollection *lc)
 {
-	BKE_layer_collection_free(sl, lc);
-	BLI_remlink(&sl->layer_collections, lc);
+	BKE_layer_collection_free(view_layer, lc);
+	BLI_remlink(&view_layer->layer_collections, lc);
 	MEM_freeN(lc);
-	sl->active_collection = 0;
+	view_layer->active_collection = 0;
 }
 
 /**
  * Recursively enable nested collections
  */
-static void layer_collection_enable(ViewLayer *sl, LayerCollection *lc)
+static void layer_collection_enable(ViewLayer *view_layer, LayerCollection *lc)
 {
-	layer_collection_objects_populate(sl, lc, &lc->scene_collection->objects);
+	layer_collection_objects_populate(view_layer, lc, &lc->scene_collection->objects);
 
 	for (LayerCollection *nlc = lc->layer_collections.first; nlc; nlc = nlc->next) {
-		layer_collection_enable(sl, nlc);
+		layer_collection_enable(view_layer, nlc);
 	}
 }
 
@@ -860,25 +860,25 @@ static void layer_collection_enable(ViewLayer *sl, LayerCollection *lc)
  * Add its objects bases to ViewLayer
  * Depsgraph needs to be rebuilt afterwards
  */
-void BKE_collection_enable(ViewLayer *sl, LayerCollection *lc)
+void BKE_collection_enable(ViewLayer *view_layer, LayerCollection *lc)
 {
 	if ((lc->flag & COLLECTION_DISABLED) == 0) {
 		return;
 	}
 
 	lc->flag &= ~COLLECTION_DISABLED;
-	layer_collection_enable(sl, lc);
+	layer_collection_enable(view_layer, lc);
 }
 
 /**
  * Recursively disable nested collections
  */
-static void layer_collection_disable(ViewLayer *sl, LayerCollection *lc)
+static void layer_collection_disable(ViewLayer *view_layer, LayerCollection *lc)
 {
-	layer_collection_objects_unpopulate(sl, lc);
+	layer_collection_objects_unpopulate(view_layer, lc);
 
 	for (LayerCollection *nlc = lc->layer_collections.first; nlc; nlc = nlc->next) {
-		layer_collection_disable(sl, nlc);
+		layer_collection_disable(view_layer, nlc);
 	}
 }
 
@@ -887,19 +887,19 @@ static void layer_collection_disable(ViewLayer *sl, LayerCollection *lc)
  * Remove all its object bases from ViewLayer
  * Depsgraph needs to be rebuilt afterwards
  */
-void BKE_collection_disable(ViewLayer *sl, LayerCollection *lc)
+void BKE_collection_disable(ViewLayer *view_layer, LayerCollection *lc)
 {
 	if ((lc->flag & COLLECTION_DISABLED) != 0) {
 		return;
 	}
 
 	lc->flag |= COLLECTION_DISABLED;
-	layer_collection_disable(sl, lc);
+	layer_collection_disable(view_layer, lc);
 }
 
-static void layer_collection_object_add(ViewLayer *sl, LayerCollection *lc, Object *ob)
+static void layer_collection_object_add(ViewLayer *view_layer, LayerCollection *lc, Object *ob)
 {
-	Base *base = object_base_add(sl, ob);
+	Base *base = object_base_add(view_layer, ob);
 
 	/* Only add an object once - prevent SceneCollection->objects and
 	 * SceneCollection->filter_objects to add the same object. */
@@ -922,36 +922,36 @@ static void layer_collection_object_add(ViewLayer *sl, LayerCollection *lc, Obje
 	BLI_addtail(&lc->object_bases, BLI_genericNodeN(base));
 }
 
-static void layer_collection_object_remove(ViewLayer *sl, LayerCollection *lc, Object *ob)
+static void layer_collection_object_remove(ViewLayer *view_layer, LayerCollection *lc, Object *ob)
 {
 	Base *base;
-	base = BKE_view_layer_base_find(sl, ob);
+	base = BKE_view_layer_base_find(view_layer, ob);
 
 	LinkData *link = BLI_findptr(&lc->object_bases, base, offsetof(LinkData, data));
 	BLI_remlink(&lc->object_bases, link);
 	MEM_freeN(link);
 
-	view_layer_object_base_unref(sl, base);
+	view_layer_object_base_unref(view_layer, base);
 }
 
-static void layer_collection_objects_populate(ViewLayer *sl, LayerCollection *lc, ListBase *objects)
+static void layer_collection_objects_populate(ViewLayer *view_layer, LayerCollection *lc, ListBase *objects)
 {
 	for (LinkData *link = objects->first; link; link = link->next) {
-		layer_collection_object_add(sl, lc, link->data);
+		layer_collection_object_add(view_layer, lc, link->data);
 	}
 }
 
-static void layer_collection_populate(ViewLayer *sl, LayerCollection *lc, SceneCollection *sc)
+static void layer_collection_populate(ViewLayer *view_layer, LayerCollection *lc, SceneCollection *sc)
 {
-	layer_collection_objects_populate(sl, lc, &sc->objects);
-	layer_collection_objects_populate(sl, lc, &sc->filter_objects);
+	layer_collection_objects_populate(view_layer, lc, &sc->objects);
+	layer_collection_objects_populate(view_layer, lc, &sc->filter_objects);
 
 	for (SceneCollection *nsc = sc->scene_collections.first; nsc; nsc = nsc->next) {
-		layer_collection_add(sl, lc, nsc);
+		layer_collection_add(view_layer, lc, nsc);
 	}
 }
 
-static LayerCollection *layer_collection_add(ViewLayer *sl, LayerCollection *parent, SceneCollection *sc)
+static LayerCollection *layer_collection_add(ViewLayer *view_layer, LayerCollection *parent, SceneCollection *sc)
 {
 	IDPropertyTemplate val = {0};
 	LayerCollection *lc = MEM_callocN(sizeof(LayerCollection), "Collection Base");
@@ -966,10 +966,10 @@ static LayerCollection *layer_collection_add(ViewLayer *sl, LayerCollection *par
 		BLI_addtail(&parent->layer_collections, lc);
 	}
 	else {
-		BLI_addtail(&sl->layer_collections, lc);
+		BLI_addtail(&view_layer->layer_collections, lc);
 	}
 
-	layer_collection_populate(sl, lc, sc);
+	layer_collection_populate(view_layer, lc, sc);
 
 	return lc;
 }
@@ -979,9 +979,9 @@ static LayerCollection *layer_collection_add(ViewLayer *sl, LayerCollection *par
 /**
  * See if render layer has the scene collection linked directly, or indirectly (nested)
  */
-bool BKE_view_layer_has_collection(ViewLayer *sl, const SceneCollection *sc)
+bool BKE_view_layer_has_collection(ViewLayer *view_layer, const SceneCollection *sc)
 {
-	for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) {
+	for (LayerCollection *lc = view_layer->layer_collections.first; lc; lc = lc->next) {
 		if (find_layer_collection_by_scene_collection(lc, sc) != NULL) {
 			return true;
 		}
@@ -994,8 +994,8 @@ bool BKE_view_layer_has_collection(ViewLayer *sl, const SceneCollection *sc)
  */
 bool BKE_scene_has_object(Scene *scene, Object *ob)
 {
-	for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) {
-		Base *base = BKE_view_layer_base_find(sl, ob);
+	for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+		Base *base = BKE_view_layer_base_find(view_layer, ob);
 		if (base) {
 			return true;
 		}
@@ -1027,11 +1027,11 @@ static LayerCollection *find_layer_collection_by_scene_collection(LayerCollectio
  */
 void BKE_layer_sync_new_scene_collection(Scene *scene, const SceneCollection *sc_parent, SceneCollection *sc)
 {
-	for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) {
-		for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) {
+	for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+		for (LayerCollection *lc = view_layer->layer_collections.first; lc; lc = lc->next) {
 			LayerCollection *lc_parent = find_layer_collection_by_scene_collection(lc, sc_parent);
 			if (lc_parent) {
-				layer_collection_add(sl, lc_parent, sc);
+				layer_collection_add(view_layer, lc_parent, sc);
 			}
 		}
 	}
@@ -1042,11 +1042,11 @@ void BKE_layer_sync_new_scene_collection(Scene *scene, const SceneCollection *sc
  */
 void BKE_layer_sync_object_link(const Scene *scene, SceneCollection *sc, Object *ob)
 {
-	for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) {
-		for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) {
+	for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+		for (LayerCollection *lc = view_layer->layer_collections.first; lc; lc = lc->next) {
 			LayerCollection *found = find_layer_collection_by_scene_collection(lc, sc);
 			if (found) {
-				layer_collection_object_add(sl, found, ob);
+				layer_collection_object_add(view_layer, found, ob);
 			}
 		}
 	}
@@ -1058,11 +1058,11 @@ void BKE_layer_sync_object_link(const Scene *scene, SceneCollection *sc, Object
  */
 void BKE_layer_sync_object_unlink(const Scene *scene, SceneCollection *sc, Object *ob)
 {
-	for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) {
-		for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) {
+	for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+		for (LayerCollection *lc = view_layer->layer_collections.first; lc; lc = lc->next) {
 			LayerCollection *found = find_layer_collection_by_scene_collection(lc, sc);
 			if (found) {
-				layer_collection_object_remove(sl, found, ob);
+				layer_collection_object_remove(view_layer, found, ob);
 			}
 		}
 	}
@@ -1152,8 +1152,8 @@ static void create_layer_collection_engines_settings_scene(Scene *scene, EngineS
 	/* Populate the scene with the new settings. */
 	create_layer_collection_engine_settings_scene(scene, es_type);
 
-	for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) {
-		for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) {
+	for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+		for (LayerCollection *lc = view_layer->layer_collections.first; lc; lc = lc->next) {
 			create_layer_collection_engine_settings_collection(lc, es_type);
 		}
 	}
@@ -1165,14 +1165,14 @@ static void create_view_layer_engines_settings_scene(Scene *scene, EngineSetting
 	create_view_layer_engine_settings_scene(scene, es_type);
 }
 
-static void create_view_layer_engines_settings_layer(ViewLayer *sl, EngineSettingsCB_Type *es_type)
+static void create_view_layer_engines_settings_layer(ViewLayer *view_layer, EngineSettingsCB_Type *es_type)
 {
-	if (BKE_view_layer_engine_layer_get(sl, COLLECTION_MODE_NONE, es_type->name)) {
+	if (BKE_view_layer_engine_layer_get(view_layer, COLLECTION_MODE_NONE, es_type->name)) {
 		return;
 	}
 
 	IDProperty *props = collection_engine_settings_create(es_type, false);
-	IDP_AddToGroup(sl->properties, props);
+	IDP_AddToGroup(view_layer->properties, props);
 }
 
 static EngineSettingsCB_Type *engine_settings_callback_register(const char *engine_name, EngineSettingsCB func, ListBase *lb)
@@ -1220,8 +1220,8 @@ void BKE_view_layer_engine_settings_callback_register(
 		for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 			create_view_layer_engines_settings_scene(scene, es_type);
 
-			for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) {
-				create_view_layer_engines_settings_layer(sl, es_type);
+			for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+				create_view_layer_engines_settings_layer(view_layer, es_type);
 			}
 		}
 	}
@@ -1440,17 +1440,17 @@ IDProperty *BKE_view_layer_engine_scene_get(Scene *scene, const int type, const
 /**
  * Return scene layer engine settings for specified engine
  */
-IDProperty *BKE_view_layer_engine_layer_get(ViewLayer *sl, const int type, const char *engine_name)
+IDProperty *BKE_view_layer_engine_layer_get(ViewLayer *view_layer, const int type, const char *engine_name)
 {
-	return collection_engine_get(sl->properties, type, engine_name);
+	return collection_engine_get(view_layer->properties, type, engine_name);
 }
 
 /**
  * Return scene layer evaluated engine settings for specified engine
  */
-IDProperty *BKE_view_layer_engine_evaluated_get(ViewLayer *sl, const int type, const char *engine_name)
+IDProperty *BKE_view_layer_engine_evaluated_get(ViewLayer *view_layer, const int type, const char *engine_name)
 {
-	return collection_engine_get(sl->properties_evaluated, type, engine_name);
+	return collection_engine_get(view_layer->properties_evaluated, type, engine_name);
 }
 
 /* ---------------------------------------------------------------------- */
@@ -1702,13 +1702,13 @@ void BKE_view_layer_engine_settings_validate_scene(Scene *scene)
 /**
  * Make sure Scene has all required collection settings.
  */
-void BKE_view_layer_engine_settings_validate_layer(ViewLayer *sl)
+void BKE_view_layer_engine_settings_validate_layer(ViewLayer *view_layer)
 {
 	if (root_reference.view_layer == NULL) {
 		engine_settings_validate_init();
 	}
 
-	IDP_MergeGroup(sl->properties, root_reference.view_layer, false);
+	IDP_MergeGroup(view_layer->properties, root_reference.view_layer, false);
 }
 
 /* ---------------------------------------------------------------------- */
@@ -1716,8 +1716,8 @@ void BKE_view_layer_engine_settings_validate_layer(ViewLayer *sl)
 
 static void object_bases_iterator_begin(BLI_Iterator *iter, void *data_in, const int flag)
 {
-	ViewLayer *sl = data_in;
-	Base *base = sl->object_bases.first;
+	ViewLayer *view_layer = data_in;
+	Base *base = view_layer->object_bases.first;
 
 	/* when there are no objects */
 	if (base ==  NULL) {
@@ -1834,8 +1834,8 @@ void BKE_renderable_objects_iterator_begin(BLI_Iterator *iter, void *data_in)
 	ObjectsRenderableIteratorData *data = data_in;
 
 	for (Scene *scene = data->scene; scene; scene = scene->set) {
-		for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) {
-			for (Base *base = sl->object_bases.first; base; base = base->next) {
+		for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+			for (Base *base = view_layer->object_bases.first; base; base = base->next) {
 				 base->object->id.flag |=  LIB_TAG_DOIT;
 			}
 		}
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 1a93746b515..5a0ac86823f 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -372,8 +372,8 @@ Object *BKE_mball_basis_find(Scene *scene, Object *basis)
 
 	BLI_split_name_num(basisname, &basisnr, basis->id.name + 2, '.');
 
-	for (ViewLayer *sl = scene->view_layers.first; sl; sl = sl->next) {
-		for (Base *base = sl->object_bases.first; base; base = base->next) {
+	for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
+		for (Base *base = view_layer->object_bases.first; base; base = base->next) {
 			Object *ob = base->object;
 			if ((ob->type == OB_MBALL) && !(base->flag & OB_FROMDUPLI)) {
 				if (ob != bob) {
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 72dbd545f8c..8fa4ebb8b3c 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -864,9 +864,9 @@ static LodLevel *lod_level_select(Object *ob, const float camera_position[3])
 	return current;
 }
 
-bool BKE_object_lod_is_usable(Object *ob, ViewLayer *sl)
+bool BKE_object_lod_is_usable(Object *ob, ViewLayer *view_layer)
 {
-	bool active = (sl) ? ob == OBACT(sl) : false;
+	bool active = (view_layer) ? ob == OBACT(view_layer) : false;
 	return (ob->mode == OB_MODE_OBJECT || !active);
 }
 
@@ -880,11 +880,11 @@ void BKE_object_lod_update(Object *ob, const float camera_position[3])
 	}
 }
 
-static Object *lod_ob_get(Object *ob, ViewLayer *sl, int flag)
+static Object *lod_ob_get(Object *ob, ViewLayer *view_layer, int flag)
 {
 	LodLevel *current = ob->currentlod;
 
-	if (!current || !BKE_object_lod_is_usable(ob, sl))
+	if (!current || !BKE_object_lod_is_usable(ob, view_layer))
 		return ob;
 
 	while (current->prev && (!(current->flags & flag) || !current->source || current->source->type != OB_MESH)) {
@@ -894,14 +894,14 @@ static Object *lod_ob_get(Object *ob, ViewLayer *sl, int flag)
 	return current->source;
 }
 
-struct Object *BKE_object_lod_meshob_get(Object *ob, ViewLayer *sl)
+struct Object *BKE_object_lod_meshob_get(Object *ob, ViewLayer *view_layer)
 {
-	return lod_ob_get(ob, sl, OB_LOD_USE_MESH);
+	return lod_ob_get(ob, view_layer, OB_LOD_USE_MESH);
 }
 
-struct Object *BKE_object_lod_matob_get(Object *ob, ViewLayer *sl)
+struct Object *BKE_object_lod_matob_get(Object *ob, ViewLayer *view_layer)
 {
-	return lod_ob_get(ob, sl, OB_LOD_USE_MAT);
+	return lod_ob_get(ob, view_layer, OB_LOD_USE_MAT);
 }
 
 #endif  /* WITH_GAMEENGINE */
@@ -2566,13 +2566,13 @@ void BKE_object_foreach_display_point(
 }
 
 void BKE_scene_foreach_display_point(
-        Scene *scene, ViewLayer *sl,
+        Scene *scene, ViewLayer *view_layer,
         void (*func_cb)(const float[3], void *), void *user_data)
 {
 	Base *base;
 	Object *ob;
 
-	for (base = FIRSTBASE(sl); base; base = base->next) {
+	for (base = FIRSTBASE(view_layer); base; base = base->next) {
 		if (((base->flag & BASE_VISIBLED) != 0) && ((base->flag & BASE_SELECTED) != 0)) {
 			ob = base->object;
 
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index df5851f927c..c88642a8164 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -75,9 +75,9 @@ const char PAINT_CURSOR_TEXTURE_PAINT[3] = {255, 255, 255};
 
 static eOverlayControlFlags overlay_flags = 0;
 
-void BKE_paint_invalidate_overlay_tex(Scene *scene, ViewLayer *sl, const Tex *tex)
+void BKE_paint_invalidate_overlay_tex(Scene *scene, ViewLayer *view_layer, const Tex *tex)
 {
-	Paint *p = BKE_paint_get_active(scene, sl);
+	Paint *p = BKE_paint_get_active(scene, view_layer);
 	Brush *br = p->brush;
 
 	if (!br)
@@ -89,9 +89,9 @@ void BKE_paint_invalidate_overlay_tex(Scene *scene, ViewLayer *sl, const Tex *te
 		overlay_flags |= PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY;
 }
 
-void BKE_paint_invalidate_cursor_overlay(Scene *scene, ViewLayer *sl, CurveMapping *curve)
+void BKE_paint_invalidate_cursor_overlay(Scene *scene, ViewLayer *view_layer, CurveMapping *curve)
 {
-	Paint *p = BKE_paint_get_active(scene, sl);
+	Paint *p = BKE_paint_get_active(scene, view_layer);
 	Brush *br = p->brush;
 
 	if (br && br->curve == curve)
@@ -157,13 +157,13 @@ Paint *BKE_paint_get_active_from_paintmode(Scene *sce, ePaintMode mode)
 	return NULL;
 }
 
-Paint *BKE_paint_get_active(Scene *sce, ViewLayer *sl)
+Paint *BKE_paint_get_active(Scene *sce, ViewLayer *view_layer)
 {
-	if (sce && sl) {
+	if (sce && view_layer) {
 		ToolSettings *ts = sce->toolsettings;
 		
-		if (sl->basact && sl->basact->object) {
-			switch (sl->basact->object->mode) {
+		if (view_layer->basact && view_layer->basact->object) {
+			switch (view_layer->basact->object->mode) {
 				case OB_MODE_SCULPT:
 					return &ts->sculpt->paint;
 				case OB_MODE_VERTEX_PAINT:
@@ -189,15 +189,15 @@ Paint *BKE_paint_get_active(Scene *sce, ViewLayer *sl)
 Paint *BKE_paint_get_active_from_context(const bContext *C)
 {
 	Scene *sce = CTX_data_scene(C);
-	ViewLayer *sl = CTX_data_view_layer(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	SpaceImage *sima;
 
-	if (sce && sl) {
+	if (sce && view_layer) {
 		ToolSettings *ts = sce->toolsettings;
 		Object *obact = NULL;
 
-		if (sl->basact && sl->basact->object)
-			obact = sl->basact->object;
+		if (view_layer->basact && view_layer->basact->object)
+			obact = view_layer->basact->object;
 
 		if ((sima = CTX_wm_space_image(C)) != NULL) {
 			if (obact && obact->mode == OB_MODE_EDIT) {
@@ -240,15 +240,15 @@ Paint *BKE_paint_get_active_from_context(const bContext *C)
 ePaintMode BKE_paintmode_get_active_from_context(const bContext *C)
 {
 	Scene *sce = CTX_data_scene(C);
-	ViewLayer *sl = CTX_data_view_layer(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	SpaceImage *sima;
 
-	if (sce && sl) {
+	if (sce && view_layer) {
 		ToolSettings *ts = sce->toolsettings;
 		Object *obact = NULL;
 
-		if (sl->basact && sl->basact->object)
-			obact = sl->basact->object;
+		if (view_layer->basact && view_layer->basact->object)
+			obact = view_layer->basact->object;
 
 		if ((sima = CTX_wm_space_image(C)) != NULL) {
 			if (obact && obact->mode == OB_MODE_EDIT) {
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index f42270d05f0..7fa7aa71eae 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -213,14 +213,14 @@ static void layer_collections_sync_flags(ListBase *layer_collections_dst, const
 
 /* recreate the LayerCollection tree */
 static void layer_collections_recreate(
-        ViewLayer *sl_dst, ListBase *lb_src, SceneCollection *mc_dst, SceneCollection *mc_src)
+        ViewLayer *view_layer_dst, ListBase *lb_src, SceneCollection *mc_dst, SceneCollection *mc_src)
 {
 	for (LayerCollection *lc_src = lb_src->first; lc_src; lc_src = lc_src->next) {
 		SceneCollection *sc_dst = scene_collection_from_new_tree(lc_src->scene_collection, mc_dst, mc_src);
 		BLI_assert(sc_dst);
 
 		/* instead of synchronizing both trees we simply re-create it */
-		BKE_collection_link(sl_dst, sc_dst);
+		BKE_collection_link(view_layer_dst, sc_dst);
 	}
 }
 
@@ -641,11 +641,11 @@ void BKE_scene_free_ex(Scene *sce, const bool do_id_user)
 	BKE_previewimg_free(&sce->preview);
 	curvemapping_free_data(&sce->r.mblur_shutter_curve);
 
-	for (ViewLayer *sl = sce->view_layers.first, *sl_next; sl; sl = sl_next) {
-		sl_next = sl->next;
+	for (ViewLayer *view_layer = sce->view_layers.first, *view_layer_next; view_layer; view_layer = view_layer_next) {
+		view_layer_next = view_layer->next;
 
-		BLI_remlink(&sce->view_layers, sl);
-		BKE_view_layer_free(sl);
+		BLI_remlink(&sce->view_layers, view_layer);
+		BKE_view_layer_free(view_layer);
 	}
 
 	/* Master Collection */
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 33da3623481..b5eed6c78de 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -695,16 +695,16 @@ void smokeModifier_copy(struct SmokeModifierData *smd, struct SmokeModifierData
 #ifdef WITH_SMOKE
 
 // forward decleration
-static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer *sl);
+static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer *view_layer);
 static float calc_voxel_transp(float *result, float *input, int res[3], int *pixel, float *tRay, float correct);
 
-static int get_lamp(ViewLayer *sl, float *light)
+static int get_lamp(ViewLayer *view_layer, float *light)
 {
 	Base *base_tmp = NULL;
 	int found_lamp = 0;
 
 	// try to find a lamp, preferably local
-	for (base_tmp = FIRSTBASE(sl); base_tmp; base_tmp = base_tmp->next) {
+	for (base_tmp = FIRSTBASE(view_layer); base_tmp; base_tmp = base_tmp->next) {
 		if (base_tmp->object->type == OB_LAMP) {
 			Lamp *la = base_tmp->object->data;
 
@@ -2950,7 +2950,7 @@ static void bresenham_linie_3D(int x1, int y1, int z1, int x2, int y2, int z2, f
 	cb(result, input, res, pixel, tRay, correct);
 }
 
-static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer *sl)
+static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer *view_layer)
 {
 	float bv[6] = {0};
 	float light[3];
@@ -2958,7 +2958,7 @@ static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer *sl)
 	float *density = smoke_get_density(sds->fluid);
 	float correct = -7.0f * sds->dx;
 
-	if (!get_lamp(sl, light)) return;
+	if (!get_lamp(view_layer, light)) return;
 
 	/* convert light pos to sim cell space */
 	mul_m4_v3(sds->imat, light);
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 1f69fca07fe..d7d274f32b5 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -514,7 +514,7 @@ static void ccd_build_deflector_hash_single(GHash *hash, Object *ob)
 /**
  * \note group overrides scene when not NULL.
  */
-static void ccd_build_deflector_hash(ViewLayer *sl, Group *group, Object *vertexowner, GHash *hash)
+static void ccd_build_deflector_hash(ViewLayer *view_layer, Group *group, Object *vertexowner, GHash *hash)
 {
 	Object *ob;
 
@@ -532,7 +532,7 @@ static void ccd_build_deflector_hash(ViewLayer *sl, Group *group, Object *vertex
 		}
 	}
 	else {
-		for (Base *base = FIRSTBASE(sl); base; base = base->next) {
+		for (Base *base = FIRSTBASE(view_layer); base; base = base->next) {
 			/*Only proceed for mesh object in same layer */
 			if (base->object->type == OB_MESH) {
 				ob = base->object;
@@ -560,7 +560,7 @@ static void ccd_update_deflector_hash_single(GHash *hash, Object *ob)
 /**
  * \note group overrides scene when not NULL.
  */
-static void ccd_update_deflector_hash(ViewLayer *sl, Group *group, Object *vertexowner, GHash *hash)
+static void ccd_update_deflector_hash(ViewLayer *view_layer, Group *group, Object *vertexowner, GHash *hash)
 {
 	Object *ob;
 
@@ -578,7 +578,7 @@ static void ccd_update_deflector_hash(ViewLayer *sl, Group *group, Object *verte
 		}
 	}
 	else {
-		for (Base *base = FIRSTBASE(sl); base; base = base->next) {
+		for (Base *base = FIRSTBASE(view_layer); base; base = base->next) {
 			/*Only proceed for mesh object in same layer */
 			if (base->object->type == OB_MESH) {
 				ob = base->object;
@@ -979,7 +979,7 @@ static void free_softbody_intern(SoftBody *sb)
 /**
  * \note group overrides scene when not NULL.
  */
-static bool are_there_deflectors(ViewLayer *sl, Group *group)
+static bool are_there_deflectors(ViewLayer *view_layer, Group *group)
 {
 	if (group) {
 		for (GroupObject *go = group->gobject.first; go; go = go->next) {
@@ -988,7 +988,7 @@ static bool are_there_deflectors(ViewLayer *sl, Group *group)
 		}
 	}
 	else {
-		for (Base *base = FIRSTBASE(sl); base; base = base->next) {
+		for (Base *base = FIRSTBASE(view_layer); base; base = base->next) {
 			if (base->object->pd) {
 				if (base->object->pd->deflect)
 					return 1;
@@ -999,9 +999,9 @@ static bool are_there_deflectors(ViewLayer *sl, Group *group)
 	return 0;
 }
 
-static int query_external_colliders(ViewLayer *sl, Group *group)
+static int query_external_colliders(ViewLayer *view_layer, Group *group)
 {
-	return(are_there_deflectors(sl, group));
+	return(are_there_deflectors(view_layer, group));
 }
 /* --- dependency information functions*/