Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer

1 files changed, 14 insertions, 14 deletions

diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index 559ef07c488..d84f256bc32 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -89,9 +89,9 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 	ScrArea *sa = CTX_wm_area(C);
 	Scene *scene = WM_window_get_active_scene(win);
 	WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook);
-	ViewLayer *sl = BKE_view_layer_from_workspace_get(scene, workspace);
+	ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace);
 	Object *obedit = scene->obedit;
-	Object *obact = sl->basact ? sl->basact->object : NULL;
+	Object *obact = view_layer->basact ? view_layer->basact->object : NULL;
 
 	if (CTX_data_dir(member)) {
 		CTX_data_dir_set(result, screen_context_dir);
@@ -102,7 +102,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if (CTX_data_equals(member, "visible_objects")) {
-		FOREACH_VISIBLE_OBJECT(sl, ob)
+		FOREACH_VISIBLE_OBJECT(view_layer, ob)
 		{
 			CTX_data_id_list_add(result, &ob->id);
 		}
@@ -111,7 +111,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if (CTX_data_equals(member, "selectable_objects")) {
-		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_VISIBLED) != 0) && ((base->flag & BASE_SELECTABLED) != 0)) {
 				CTX_data_id_list_add(result, &base->object->id);
 			}
@@ -120,7 +120,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if (CTX_data_equals(member, "selected_objects")) {
-		FOREACH_SELECTED_OBJECT(sl, ob)
+		FOREACH_SELECTED_OBJECT(view_layer, ob)
 		{
 			CTX_data_id_list_add(result, &ob->id);
 		}
@@ -129,7 +129,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if (CTX_data_equals(member, "selected_editable_objects")) {
-		FOREACH_SELECTED_OBJECT(sl, ob)
+		FOREACH_SELECTED_OBJECT(view_layer, ob)
 		{
 			if (0 == BKE_object_is_libdata(ob)) {
 				CTX_data_id_list_add(result, &ob->id);
@@ -141,7 +141,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 	}
 	else if (CTX_data_equals(member, "editable_objects")) {
 		/* Visible + Editable, but not necessarily selected */
-		FOREACH_VISIBLE_OBJECT(sl, ob)
+		FOREACH_VISIBLE_OBJECT(view_layer, ob)
 		{
 			if (0 == BKE_object_is_libdata(ob)) {
 				CTX_data_id_list_add(result, &ob->id);
@@ -152,7 +152,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if ( CTX_data_equals(member, "visible_bases")) {
-		FOREACH_VISIBLE_BASE(sl, base)
+		FOREACH_VISIBLE_BASE(view_layer, base)
 		{
 			CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
 		}
@@ -161,7 +161,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if (CTX_data_equals(member, "selectable_bases")) {
-		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_SELECTABLED) != 0) {
 				CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
 			}
@@ -170,7 +170,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if (CTX_data_equals(member, "selected_bases")) {
-		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) {
 				CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
 			}
@@ -179,7 +179,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		return 1;
 	}
 	else if (CTX_data_equals(member, "selected_editable_bases")) {
-		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) {
 				if (0 == BKE_object_is_libdata(base->object)) {
 					CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
@@ -191,7 +191,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 	}
 	else if (CTX_data_equals(member, "editable_bases")) {
 		/* Visible + Editable, but not necessarily selected */
-		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_VISIBLED) != 0) {
 				if (0 == BKE_object_is_libdata(base->object)) {
 					CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
@@ -346,8 +346,8 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		}
 	}
 	else if (CTX_data_equals(member, "active_base")) {
-		if (sl->basact)
-			CTX_data_pointer_set(result, &scene->id, &RNA_ObjectBase, sl->basact);
+		if (view_layer->basact)
+			CTX_data_pointer_set(result, &scene->id, &RNA_ObjectBase, view_layer->basact);
 
 		return 1;
 	}