Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer

3 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index 48c6fdcedde..587689eda78 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -374,10 +374,10 @@ bool ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit)
 }
 
 /* matches clip function */
-bool ED_space_image_check_show_maskedit(ViewLayer *sl, SpaceImage *sima)
+bool ED_space_image_check_show_maskedit(ViewLayer *view_layer, SpaceImage *sima)
 {
 	/* check editmode - this is reserved for UV editing */
-	Object *ob = OBACT(sl);
+	Object *ob = OBACT(view_layer);
 	if (ob && ob->mode & OB_MODE_EDIT && ED_space_image_show_uvedit(sima, ob)) {
 		return false;
 	}
@@ -390,8 +390,8 @@ int ED_space_image_maskedit_poll(bContext *C)
 	SpaceImage *sima = CTX_wm_space_image(C);
 
 	if (sima) {
-		ViewLayer *sl = CTX_data_view_layer(C);
-		return ED_space_image_check_show_maskedit(sl, sima);
+		ViewLayer *view_layer = CTX_data_view_layer(C);
+		return ED_space_image_check_show_maskedit(view_layer, sima);
 	}
 
 	return false;
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 49e5019b604..5a69deb82a7 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -794,7 +794,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op))
 	SpaceImage *sima;
 	ARegion *ar;
 	Scene *scene;
-	ViewLayer *sl;
+	ViewLayer *view_layer;
 	Object *obedit;
 	Image *ima;
 
@@ -802,7 +802,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op))
 	sima = CTX_wm_space_image(C);
 	ar = CTX_wm_region(C);
 	scene = CTX_data_scene(C);
-	sl = CTX_data_view_layer(C);
+	view_layer = CTX_data_view_layer(C);
 	obedit = CTX_data_edit_object(C);
 
 	ima = ED_space_image(sima);
@@ -814,7 +814,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op))
 			return OPERATOR_CANCELLED;
 		}
 	}
-	else if (ED_space_image_check_show_maskedit(sl, sima)) {
+	else if (ED_space_image_check_show_maskedit(view_layer, sima)) {
 		if (!ED_mask_selected_minmax(C, min, max)) {
 			return OPERATOR_CANCELLED;
 		}
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index ffc66f50cc9..4f595ad98c6 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -537,8 +537,8 @@ static void image_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Sc
 				case ND_TRANSFORM:
 				case ND_MODIFIER:
 				{
-					ViewLayer *sl = BKE_view_layer_from_workspace_get(scene, workspace);
-					Object *ob = OBACT(sl);
+					ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace);
+					Object *ob = OBACT(view_layer);
 					if (ob && (ob == wmn->reference) && (ob->mode & OB_MODE_EDIT)) {
 						if (sima->lock && (sima->flag & SI_DRAWSHADOW)) {
 							ED_area_tag_refresh(sa);
@@ -721,7 +721,7 @@ static void image_main_region_draw(const bContext *C, ARegion *ar)
 	Mask *mask = NULL;
 	bool curve = false;
 	Scene *scene = CTX_data_scene(C);
-	ViewLayer *sl = CTX_data_view_layer(C);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 	View2D *v2d = &ar->v2d;
 	//View2DScrollers *scrollers;
 	float col[3];
@@ -757,7 +757,7 @@ static void image_main_region_draw(const bContext *C, ARegion *ar)
 
 	ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
 
-	ED_uvedit_draw_main(sima, ar, scene, sl, obedit, obact, depsgraph);
+	ED_uvedit_draw_main(sima, ar, scene, view_layer, obedit, obact, depsgraph);
 
 	/* check for mask (delay draw) */
 	if (ED_space_image_show_uvedit(sima, obedit)) {