Cleanup: Use full name for scene_layer in makesrna

12 files changed, 115 insertions, 114 deletions

diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index b7d108fc769..52b70b151ab 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -375,9 +375,9 @@ static void rna_Brush_main_tex_update(bContext *C, PointerRNA *ptr)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
 	Brush *br = (Brush *)ptr->data;
-	BKE_paint_invalidate_overlay_tex(scene, sl, br->mtex.tex);
+	BKE_paint_invalidate_overlay_tex(scene, scene_layer, br->mtex.tex);
 	rna_Brush_update(bmain, scene, ptr);
 }
 
@@ -385,9 +385,9 @@ static void rna_Brush_secondary_tex_update(bContext *C, PointerRNA *ptr)
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
 	Brush *br = (Brush *)ptr->data;
-	BKE_paint_invalidate_overlay_tex(scene, sl, br->mask_mtex.tex);
+	BKE_paint_invalidate_overlay_tex(scene, scene_layer, br->mask_mtex.tex);
 	rna_Brush_update(bmain, scene, ptr);
 }
 
@@ -449,8 +449,8 @@ static void rna_TextureSlot_brush_angle_update(bContext *C, PointerRNA *ptr)
 	MTex *mtex = ptr->data;
 	/* skip invalidation of overlay for stencil mode */
 	if (mtex->mapping != MTEX_MAP_MODE_STENCIL) {
-		SceneLayer *sl = CTX_data_scene_layer(C);
-		BKE_paint_invalidate_overlay_tex(scene, sl, mtex->tex);
+		SceneLayer *scene_layer = CTX_data_scene_layer(C);
+		BKE_paint_invalidate_overlay_tex(scene, scene_layer, mtex->tex);
 	}
 
 	rna_TextureSlot_update(C, ptr);
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index ec9b8cc24b2..b20840ea254 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -412,7 +412,7 @@ PointerRNA rna_pointer_inherit_refine(struct PointerRNA *ptr, struct StructRNA *
 int rna_parameter_size(struct PropertyRNA *parm);
 
 struct Mesh *rna_Main_meshes_new_from_object(
-        struct Main *bmain, struct ReportList *reports, struct Scene *sce, struct SceneLayer *sl,
+        struct Main *bmain, struct ReportList *reports, struct Scene *sce, struct SceneLayer *scene_layer,
         struct Object *ob, int apply_modifiers, int settings, int calc_tessface, int calc_undeformed);
 
 /* XXX, these should not need to be defined here~! */
diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c
index 2fffc3a6c8f..100b08e38ef 100644
--- a/source/blender/makesrna/intern/rna_layer.c
+++ b/source/blender/makesrna/intern/rna_layer.c
@@ -423,8 +423,8 @@ static void rna_LayerCollectionEngineSettings_update(bContext *C, PointerRNA *UN
 static void rna_LayerCollectionEngineSettings_wire_update(bContext *C, PointerRNA *UNUSED(ptr))
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Object *ob = OBACT_NEW(sl);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Object *ob = OBACT_NEW(scene_layer);
 
 	if (ob != NULL && ob->type == OB_MESH) {
 		BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
@@ -720,45 +720,45 @@ static void rna_LayerCollection_enable_set(
 
 static int rna_LayerCollections_active_collection_index_get(PointerRNA *ptr)
 {
-	SceneLayer *sl = (SceneLayer *)ptr->data;
-	return sl->active_collection;
+	SceneLayer *scene_layer = (SceneLayer *)ptr->data;
+	return scene_layer->active_collection;
 }
 
 static void rna_LayerCollections_active_collection_index_set(PointerRNA *ptr, int value)
 {
-	SceneLayer *sl = (SceneLayer *)ptr->data;
-	int num_collections = BKE_layer_collection_count(sl);
-	sl->active_collection = min_ff(value, num_collections - 1);
+	SceneLayer *scene_layer = (SceneLayer *)ptr->data;
+	int num_collections = BKE_layer_collection_count(scene_layer);
+	scene_layer->active_collection = min_ff(value, num_collections - 1);
 }
 
 static void rna_LayerCollections_active_collection_index_range(
         PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax))
 {
-	SceneLayer *sl = (SceneLayer *)ptr->data;
+	SceneLayer *scene_layer = (SceneLayer *)ptr->data;
 	*min = 0;
-	*max = max_ii(0, BKE_layer_collection_count(sl) - 1);
+	*max = max_ii(0, BKE_layer_collection_count(scene_layer) - 1);
 }
 
 static PointerRNA rna_LayerCollections_active_collection_get(PointerRNA *ptr)
 {
-	SceneLayer *sl = (SceneLayer *)ptr->data;
-	LayerCollection *lc = BKE_layer_collection_get_active(sl);
+	SceneLayer *scene_layer = (SceneLayer *)ptr->data;
+	LayerCollection *lc = BKE_layer_collection_get_active(scene_layer);
 	return rna_pointer_inherit_refine(ptr, &RNA_LayerCollection, lc);
 }
 
 static void rna_LayerCollections_active_collection_set(PointerRNA *ptr, PointerRNA value)
 {
-	SceneLayer *sl = (SceneLayer *)ptr->data;
+	SceneLayer *scene_layer = (SceneLayer *)ptr->data;
 	LayerCollection *lc = (LayerCollection *)value.data;
-	const int index = BKE_layer_collection_findindex(sl, lc);
-	if (index != -1) sl->active_collection = index;
+	const int index = BKE_layer_collection_findindex(scene_layer, lc);
+	if (index != -1) scene_layer->active_collection = index;
 }
 
 LayerCollection * rna_SceneLayer_collection_link(
-        ID *id, SceneLayer *sl, Main *bmain, SceneCollection *sc)
+        ID *id, SceneLayer *scene_layer, Main *bmain, SceneCollection *sc)
 {
 	Scene *scene = (Scene *)id;
-	LayerCollection *lc = BKE_collection_link(sl, sc);
+	LayerCollection *lc = BKE_collection_link(scene_layer, sc);
 
 	DEG_relations_tag_update(bmain);
 	/* TODO(sergey): Use proper flag for tagging here. */
@@ -769,16 +769,17 @@ LayerCollection * rna_SceneLayer_collection_link(
 }
 
 static void rna_SceneLayer_collection_unlink(
-        ID *id, SceneLayer *sl, Main *bmain, ReportList *reports, LayerCollection *lc)
+        ID *id, SceneLayer *scene_layer, Main *bmain, ReportList *reports, LayerCollection *lc)
 {
 	Scene *scene = (Scene *)id;
 
-	if (BLI_findindex(&sl->layer_collections, lc) == -1) {
-		BKE_reportf(reports, RPT_ERROR, "Layer collection '%s' is not in '%s'", lc->scene_collection->name, sl->name);
+	if (BLI_findindex(&scene_layer->layer_collections, lc) == -1) {
+		BKE_reportf(reports, RPT_ERROR, "Layer collection '%s' is not in '%s'",
+		            lc->scene_collection->name, scene_layer->name);
 		return;
 	}
 
-	BKE_collection_unlink(sl, lc);
+	BKE_collection_unlink(scene_layer, lc);
 
 	DEG_relations_tag_update(bmain);
 	/* TODO(sergey): Use proper flag for tagging here. */
@@ -788,38 +789,38 @@ static void rna_SceneLayer_collection_unlink(
 
 static PointerRNA rna_LayerObjects_active_object_get(PointerRNA *ptr)
 {
-	SceneLayer *sl = (SceneLayer *)ptr->data;
-	return rna_pointer_inherit_refine(ptr, &RNA_Object, sl->basact ? sl->basact->object : NULL);
+	SceneLayer *scene_layer = (SceneLayer *)ptr->data;
+	return rna_pointer_inherit_refine(ptr, &RNA_Object, scene_layer->basact ? scene_layer->basact->object : NULL);
 }
 
 static void rna_LayerObjects_active_object_set(PointerRNA *ptr, PointerRNA value)
 {
-	SceneLayer *sl = (SceneLayer *)ptr->data;
+	SceneLayer *scene_layer = (SceneLayer *)ptr->data;
 	if (value.data)
-		sl->basact = BKE_scene_layer_base_find(sl, (Object *)value.data);
+		scene_layer->basact = BKE_scene_layer_base_find(scene_layer, (Object *)value.data);
 	else
-		sl->basact = NULL;
+		scene_layer->basact = NULL;
 }
 
 static void rna_SceneLayer_name_set(PointerRNA *ptr, const char *value)
 {
 	Scene *scene = (Scene *)ptr->id.data;
-	SceneLayer *sl = (SceneLayer *)ptr->data;
-	char oldname[sizeof(sl->name)];
+	SceneLayer *scene_layer = (SceneLayer *)ptr->data;
+	char oldname[sizeof(scene_layer->name)];
 
-	BLI_strncpy(oldname, sl->name, sizeof(sl->name));
+	BLI_strncpy(oldname, scene_layer->name, sizeof(scene_layer->name));
 
-	BLI_strncpy_utf8(sl->name, value, sizeof(sl->name));
-	BLI_uniquename(&scene->render_layers, sl, DATA_("SceneLayer"), '.', offsetof(SceneLayer, name), sizeof(sl->name));
+	BLI_strncpy_utf8(scene_layer->name, value, sizeof(scene_layer->name));
+	BLI_uniquename(&scene->render_layers, scene_layer, DATA_("SceneLayer"), '.', offsetof(SceneLayer, name), sizeof(scene_layer->name));
 
 	if (scene->nodetree) {
 		bNode *node;
-		int index = BLI_findindex(&scene->render_layers, sl);
+		int index = BLI_findindex(&scene->render_layers, scene_layer);
 
 		for (node = scene->nodetree->nodes.first; node; node = node->next) {
 			if (node->type == CMP_NODE_R_LAYERS && node->id == NULL) {
 				if (node->custom1 == index)
-					BLI_strncpy(node->name, sl->name, NODE_MAXSTR);
+					BLI_strncpy(node->name, scene_layer->name, NODE_MAXSTR);
 			}
 		}
 	}
@@ -856,11 +857,11 @@ static PointerRNA rna_SceneLayer_depsgraph_get(PointerRNA *ptr)
 
 static void rna_LayerObjects_selected_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
-	SceneLayer *sl = (SceneLayer *)ptr->data;
-	rna_iterator_listbase_begin(iter, &sl->object_bases, rna_SceneLayer_objects_selected_skip);
+	SceneLayer *scene_layer = (SceneLayer *)ptr->data;
+	rna_iterator_listbase_begin(iter, &scene_layer->object_bases, rna_SceneLayer_objects_selected_skip);
 }
 
-static void rna_SceneLayer_update_tagged(SceneLayer *UNUSED(sl), bContext *C)
+static void rna_SceneLayer_update_tagged(SceneLayer *UNUSED(scene_layer), bContext *C)
 {
 	Depsgraph *graph = CTX_data_depsgraph(C);
 	DEG_OBJECT_ITER(graph, ob, DEG_OBJECT_ITER_FLAG_ALL)
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 52b953549ba..3f0b213efac 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -301,14 +301,14 @@ static Mesh *rna_Main_meshes_new(Main *bmain, const char *name)
 /* copied from Mesh_getFromObject and adapted to RNA interface */
 /* settings: 1 - preview, 2 - render */
 Mesh *rna_Main_meshes_new_from_object(
-        Main *bmain, ReportList *reports, Scene *sce, SceneLayer *sl,
+        Main *bmain, ReportList *reports, Scene *sce, SceneLayer *scene_layer,
         Object *ob, int apply_modifiers, int settings, int calc_tessface, int calc_undeformed)
 {
 	EvaluationContext eval_ctx;
 
 	DEG_evaluation_context_init(&eval_ctx, settings);
 	eval_ctx.ctime = (float)sce->r.cfra + sce->r.subframe;
-	eval_ctx.scene_layer = sl;
+	eval_ctx.scene_layer = scene_layer;
 
 	switch (ob->type) {
 		case OB_FONT:
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 5db2d534dbe..9ad222d6b7a 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3129,7 +3129,7 @@ static int point_density_vertex_color_source_from_shader(NodeShaderTexPointDensi
 
 void rna_ShaderNodePointDensity_density_cache(bNode *self,
                                               Scene *scene,
-                                              SceneLayer *sl,
+                                              SceneLayer *scene_layer,
                                               int settings)
 {
 	NodeShaderTexPointDensity *shader_point_density = self->storage;
@@ -3167,13 +3167,13 @@ void rna_ShaderNodePointDensity_density_cache(bNode *self,
 
 	/* Single-threaded sampling of the voxel domain. */
 	RE_point_density_cache(scene,
-	                       sl, pd,
+	                       scene_layer, pd,
 	                       settings == 1);
 }
 
 void rna_ShaderNodePointDensity_density_calc(bNode *self,
                                              Scene *scene,
-                                             SceneLayer *sl,
+                                             SceneLayer *scene_layer,
                                              int settings,
                                              int *length,
                                              float **values)
@@ -3195,7 +3195,7 @@ void rna_ShaderNodePointDensity_density_calc(bNode *self,
 	}
 
 	/* Single-threaded sampling of the voxel domain. */
-	RE_point_density_sample(scene, sl, pd,
+	RE_point_density_sample(scene, scene_layer, pd,
 	                        resolution,
 	                        settings == 1,
 	                        *values);
@@ -3208,7 +3208,7 @@ void rna_ShaderNodePointDensity_density_calc(bNode *self,
 
 void rna_ShaderNodePointDensity_density_minmax(bNode *self,
                                                Scene *scene,
-                                               SceneLayer *sl,
+                                               SceneLayer *scene_layer,
                                                int settings,
                                                float r_min[3],
                                                float r_max[3])
@@ -3220,7 +3220,7 @@ void rna_ShaderNodePointDensity_density_minmax(bNode *self,
 		zero_v3(r_max);
 		return;
 	}
-	RE_point_density_minmax(scene, sl, pd, settings == 1, r_min, r_max);
+	RE_point_density_minmax(scene, scene_layer, pd, settings == 1, r_min, r_max);
 }
 
 #else
@@ -4204,13 +4204,13 @@ static void def_sh_tex_pointdensity(StructRNA *srna)
 	func = RNA_def_function(srna, "cache_point_density", "rna_ShaderNodePointDensity_density_cache");
 	RNA_def_function_ui_description(func, "Cache point density data for later calculation");
 	RNA_def_pointer(func, "scene", "Scene", "", "");
-	RNA_def_pointer(func, "sl", "SceneLayer", "", "");
+	RNA_def_pointer(func, "scene_layer", "SceneLayer", "", "");
 	RNA_def_enum(func, "settings", calc_mode_items, 1, "", "Calculate density for rendering");
 
 	func = RNA_def_function(srna, "calc_point_density", "rna_ShaderNodePointDensity_density_calc");
 	RNA_def_function_ui_description(func, "Calculate point density");
 	RNA_def_pointer(func, "scene", "Scene", "", "");
-	RNA_def_pointer(func, "sl", "SceneLayer", "", "");
+	RNA_def_pointer(func, "scene_layer", "SceneLayer", "", "");
 	RNA_def_enum(func, "settings", calc_mode_items, 1, "", "Calculate density for rendering");
 	/* TODO, See how array size of 0 works, this shouldnt be used. */
 	parm = RNA_def_float_array(func, "rgba_values", 1, NULL, 0, 0, "", "RGBA Values", 0, 0);
@@ -4220,7 +4220,7 @@ static void def_sh_tex_pointdensity(StructRNA *srna)
 	func = RNA_def_function(srna, "calc_point_density_minmax", "rna_ShaderNodePointDensity_density_minmax");
 	RNA_def_function_ui_description(func, "Calculate point density");
 	RNA_def_pointer(func, "scene", "Scene", "", "");
-	RNA_def_pointer(func, "sl", "SceneLayer", "", "");
+	RNA_def_pointer(func, "scene_layer", "SceneLayer", "", "");
 	RNA_def_enum(func, "settings", calc_mode_items, 1, "", "Calculate density for rendering");
 	parm = RNA_def_property(func, "min", PROP_FLOAT, PROP_COORDS);
 	RNA_def_property_array(parm, 3);
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 01370412978..9079963607f 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -93,11 +93,11 @@ static const EnumPropertyItem space_items[] = {
 
 static void rna_Object_select_set(Object *ob, bContext *C, ReportList *reports, int action)
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Base *base = BKE_scene_layer_base_find(sl, ob);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Base *base = BKE_scene_layer_base_find(scene_layer, ob);
 
 	if (!base) {
-		BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, sl->name);
+		BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, scene_layer->name);
 		return;
 	}
 
@@ -116,18 +116,18 @@ static void rna_Object_select_set(Object *ob, bContext *C, ReportList *reports,
 			break;
 		case 0: /* SELECT */
 		default:
-			BKE_scene_layer_base_select(sl, base);
+			BKE_scene_layer_base_select(scene_layer, base);
 			break;
 	}
 }
 
 static int rna_Object_select_get(Object *ob, bContext *C, ReportList *reports)
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Base *base = BKE_scene_layer_base_find(sl, ob);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Base *base = BKE_scene_layer_base_find(scene_layer, ob);
 
 	if (!base) {
-		BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, sl->name);
+		BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, scene_layer->name);
 		return -1;
 	}
 
@@ -136,11 +136,11 @@ static int rna_Object_select_get(Object *ob, bContext *C, ReportList *reports)
 
 static int rna_Object_visible_get(Object *ob, bContext *C, ReportList *reports)
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Base *base = BKE_scene_layer_base_find(sl, ob);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Base *base = BKE_scene_layer_base_find(scene_layer, ob);
 
 	if (!base) {
-		BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, sl->name);
+		BKE_reportf(reports, RPT_ERROR, "Object '%s' not in Render Layer '%s'!", ob->id.name + 2, scene_layer->name);
 		return -1;
 	}
 
@@ -197,12 +197,12 @@ static void rna_Object_camera_fit_coords(
 /* copied from Mesh_getFromObject and adapted to RNA interface */
 /* settings: 0 - preview, 1 - render */
 static Mesh *rna_Object_to_mesh(
-        Object *ob, bContext *C, ReportList *reports, Scene *sce, SceneLayer *sl,
+        Object *ob, bContext *C, ReportList *reports, Scene *sce, SceneLayer *scene_layer,
         int apply_modifiers, int settings, int calc_tessface, int calc_undeformed)
 {
 	Main *bmain = CTX_data_main(C);
 
-	return rna_Main_meshes_new_from_object(bmain, reports, sce, sl, ob, apply_modifiers, settings, calc_tessface, calc_undeformed);
+	return rna_Main_meshes_new_from_object(bmain, reports, sce, scene_layer, ob, apply_modifiers, settings, calc_tessface, calc_undeformed);
 }
 
 /* mostly a copy from convertblender.c */
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index 198a47c007e..4f8f6c55d55 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -1686,7 +1686,7 @@ static void rna_def_softbody(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "spring_length", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "springpreload");
 	RNA_def_property_range(prop, 0.0f, 200.0f);
-	RNA_def_property_ui_text(prop, "SL", "Alter spring length to shrink/blow up (unit %) 0 to disable");
+	RNA_def_property_ui_text(prop, "scene_layer", "Alter spring length to shrink/blow up (unit %) 0 to disable");
 	RNA_def_property_update(prop, 0, "rna_softbody_update");
 	
 	prop = RNA_def_property(srna, "aero", PROP_INT, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 021417648d0..b4a3fcac18f 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -614,13 +614,13 @@ static void rna_ParticleSystem_mcol_on_emitter(ParticleSystem *particlesystem, R
 	}
 }
 
-static void rna_ParticleSystem_set_resolution(ParticleSystem *particlesystem, Scene *scene, SceneLayer *sl, Object *object, int resolution)
+static void rna_ParticleSystem_set_resolution(ParticleSystem *particlesystem, Scene *scene, SceneLayer *scene_layer, Object *object, int resolution)
 {
 	EvaluationContext eval_ctx;
 
 	DEG_evaluation_context_init(&eval_ctx, resolution);
 	eval_ctx.ctime = (float)scene->r.cfra + scene->r.subframe;
-	eval_ctx.scene_layer = sl;
+	eval_ctx.scene_layer = scene_layer;
 
 	if (resolution == eModifierMode_Render) {
 		ParticleSystemModifierData *psmd = psys_get_modifier(object, particlesystem);
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 26f1ac845d4..8e469813b36 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1561,15 +1561,15 @@ static void rna_Physics_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Pointe
 static void rna_Scene_editmesh_select_mode_set(PointerRNA *ptr, const int *value)
 {
 	Scene *scene = (Scene *)ptr->id.data;
-	SceneLayer *sl = BKE_scene_layer_context_active_PLACEHOLDER(scene);
+	SceneLayer *scene_layer = BKE_scene_layer_context_active_PLACEHOLDER(scene);
 	ToolSettings *ts = (ToolSettings *)ptr->data;
 	int flag = (value[0] ? SCE_SELECT_VERTEX : 0) | (value[1] ? SCE_SELECT_EDGE : 0) | (value[2] ? SCE_SELECT_FACE : 0);
 
 	if (flag) {
 		ts->selectmode = flag;
 
-		if (sl->basact) {
-			Mesh *me = BKE_mesh_from_object(sl->basact->object);
+		if (scene_layer->basact) {
+			Mesh *me = BKE_mesh_from_object(scene_layer->basact->object);
 			if (me && me->edit_btmesh && me->edit_btmesh->selectmode != flag) {
 				me->edit_btmesh->selectmode = flag;
 				EDBM_selectmode_set(me->edit_btmesh);
@@ -1580,11 +1580,11 @@ static void rna_Scene_editmesh_select_mode_set(PointerRNA *ptr, const int *value
 
 static void rna_Scene_editmesh_select_mode_update(Main *UNUSED(bmain), bContext *C, Scene *UNUSED(scene), PointerRNA *UNUSED(ptr))
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
 	Mesh *me = NULL;
 
-	if (sl->basact) {
-		me = BKE_mesh_from_object(sl->basact->object);
+	if (scene_layer->basact) {
+		me = BKE_mesh_from_object(scene_layer->basact->object);
 		if (me && me->edit_btmesh == NULL)
 			me = NULL;
 	}
@@ -1786,8 +1786,8 @@ static KeyingSet *rna_Scene_keying_set_new(Scene *sce, ReportList *reports, cons
 static void rna_UnifiedPaintSettings_update(bContext *C, PointerRNA *UNUSED(ptr))
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Brush *br = BKE_paint_brush(BKE_paint_get_active(scene, sl));
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Brush *br = BKE_paint_brush(BKE_paint_get_active(scene, scene_layer));
 	WM_main_add_notifier(NC_BRUSH | NA_EDITED, br);
 }
 
@@ -1830,11 +1830,11 @@ static char *rna_CurvePaintSettings_path(PointerRNA *UNUSED(ptr))
 /* generic function to recalc geometry */
 static void rna_EditMesh_update(Main *UNUSED(bmain), bContext *C, Scene *UNUSED(scene), PointerRNA *UNUSED(ptr))
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
 	Mesh *me = NULL;
 
-	if (sl->basact) {
-		me = BKE_mesh_from_object(sl->basact->object);
+	if (scene_layer->basact) {
+		me = BKE_mesh_from_object(scene_layer->basact->object);
 		if (me && me->edit_btmesh == NULL)
 			me = NULL;
 	}
@@ -1857,8 +1857,8 @@ static char *rna_MeshStatVis_path(PointerRNA *UNUSED(ptr))
  * given its own notifier. */
 static void rna_Scene_update_active_object_data(bContext *C, PointerRNA *UNUSED(ptr))
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Object *ob = OBACT_NEW(sl);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Object *ob = OBACT_NEW(scene_layer);
 
 	if (ob) {
 		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
@@ -2076,16 +2076,16 @@ static void rna_SceneLayer_active_layer_index_range(
 static PointerRNA rna_SceneLayer_active_layer_get(PointerRNA *ptr)
 {
 	Scene *scene = (Scene *)ptr->data;
-	SceneLayer *sl = BLI_findlink(&scene->render_layers, scene->active_layer);
+	SceneLayer *scene_layer = BLI_findlink(&scene->render_layers, scene->active_layer);
 
-	return rna_pointer_inherit_refine(ptr, &RNA_SceneLayer, sl);
+	return rna_pointer_inherit_refine(ptr, &RNA_SceneLayer, scene_layer);
 }
 
 static void rna_SceneLayer_active_layer_set(PointerRNA *ptr, PointerRNA value)
 {
 	Scene *scene = (Scene *)ptr->data;
-	SceneLayer *sl = (SceneLayer *)value.data;
-	const int index = BLI_findindex(&scene->render_layers, sl);
+	SceneLayer *scene_layer = (SceneLayer *)value.data;
+	const int index = BLI_findindex(&scene->render_layers, scene_layer);
 	if (index != -1) scene->active_layer = index;
 }
 
@@ -2093,22 +2093,22 @@ static SceneLayer *rna_SceneLayer_new(
         ID *id, Scene *UNUSED(sce), Main *bmain, const char *name)
 {
 	Scene *scene = (Scene *)id;
-	SceneLayer *sl = BKE_scene_layer_add(scene, name);
+	SceneLayer *scene_layer = BKE_scene_layer_add(scene, name);
 
 	DEG_id_tag_update(&scene->id, 0);
 	DEG_relations_tag_update(bmain);
 	WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL);
 
-	return sl;
+	return scene_layer;
 }
 
 static void rna_SceneLayer_remove(
         ID *id, Scene *UNUSED(sce), Main *bmain, ReportList *reports, PointerRNA *sl_ptr)
 {
 	Scene *scene = (Scene *)id;
-	SceneLayer *sl = sl_ptr->data;
+	SceneLayer *scene_layer = sl_ptr->data;
 
-	if (ED_scene_render_layer_delete(bmain, scene, sl, reports)) {
+	if (ED_scene_render_layer_delete(bmain, scene, scene_layer, reports)) {
 		RNA_POINTER_INVALIDATE(sl_ptr);
 	}
 }
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 551b38771f9..8bb0eda9a0b 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -155,9 +155,9 @@ static PointerRNA rna_ParticleBrush_curve_get(PointerRNA *ptr)
 static void rna_ParticleEdit_redo(bContext *C, PointerRNA *UNUSED(ptr))
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Object *ob = OBACT_NEW(sl);
-	PTCacheEdit *edit = PE_get_current(scene, sl, ob);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Object *ob = OBACT_NEW(scene_layer);
+	PTCacheEdit *edit = PE_get_current(scene, scene_layer, ob);
 
 	if (!edit)
 		return;
@@ -167,8 +167,8 @@ static void rna_ParticleEdit_redo(bContext *C, PointerRNA *UNUSED(ptr))
 
 static void rna_ParticleEdit_update(Main *UNUSED(bmain), Scene *UNUSED(scene), bContext *C, PointerRNA *UNUSED(ptr))
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Object *ob = OBACT_NEW(sl);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Object *ob = OBACT_NEW(scene_layer);
 
 	if (ob) DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 }
@@ -191,8 +191,8 @@ static void rna_ParticleEdit_tool_set(PointerRNA *ptr, int value)
 static const EnumPropertyItem *rna_ParticleEdit_tool_itemf(bContext *C, PointerRNA *UNUSED(ptr),
                                                      PropertyRNA *UNUSED(prop), bool *UNUSED(r_free))
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Object *ob = OBACT_NEW(sl);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Object *ob = OBACT_NEW(scene_layer);
 #if 0
 	Scene *scene = CTX_data_scene(C);
 	PTCacheEdit *edit = PE_get_current(scene, ob);
@@ -265,8 +265,8 @@ static int rna_Brush_mode_poll(PointerRNA *ptr, PointerRNA value)
 static void rna_Sculpt_update(bContext *C, PointerRNA *UNUSED(ptr))
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Object *ob = OBACT_NEW(sl);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Object *ob = OBACT_NEW(scene_layer);
 
 	if (ob) {
 		DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
@@ -281,8 +281,8 @@ static void rna_Sculpt_update(bContext *C, PointerRNA *UNUSED(ptr))
 
 static void rna_Sculpt_ShowDiffuseColor_update(bContext *C, Scene *scene, PointerRNA *UNUSED(ptr))
 {
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Object *ob = OBACT_NEW(sl);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Object *ob = OBACT_NEW(scene_layer);
 
 	if (ob && ob->sculpt) {
 		Sculpt *sd = scene->toolsettings->sculpt;
@@ -344,8 +344,8 @@ static void rna_ImaPaint_viewport_update(Main *UNUSED(bmain), Scene *UNUSED(scen
 static void rna_ImaPaint_mode_update(bContext *C, PointerRNA *UNUSED(ptr))
 {
 	Scene *scene = CTX_data_scene(C);\
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Object *ob = OBACT_NEW(sl);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Object *ob = OBACT_NEW(scene_layer);
 
 	if (ob && ob->type == OB_MESH) {
 		/* of course we need to invalidate here */
@@ -361,8 +361,8 @@ static void rna_ImaPaint_mode_update(bContext *C, PointerRNA *UNUSED(ptr))
 static void rna_ImaPaint_stencil_update(bContext *C, PointerRNA *UNUSED(ptr))
 {
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Object *ob = OBACT_NEW(sl);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Object *ob = OBACT_NEW(scene_layer);
 
 	if (ob && ob->type == OB_MESH) {
 		GPU_drawobject_free(ob->derivedFinal);
@@ -375,8 +375,8 @@ static void rna_ImaPaint_canvas_update(bContext *C, PointerRNA *UNUSED(ptr))
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Object *ob = OBACT_NEW(sl);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Object *ob = OBACT_NEW(scene_layer);
 	bScreen *sc;
 	Image *ima = scene->toolsettings->imapaint.canvas;
 	
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 679ee1fe698..43fb31f3a4f 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -862,9 +862,9 @@ static int rna_SpaceImageEditor_show_maskedit_get(PointerRNA *ptr)
 	SpaceImage *sima = (SpaceImage *)(ptr->data);
 	bScreen *sc = (bScreen *)ptr->id.data;
 	Scene *scene = ED_screen_scene_find(sc, G.main->wm.first);
-	SceneLayer *sl = BKE_scene_layer_context_active_PLACEHOLDER(scene);
+	SceneLayer *scene_layer = BKE_scene_layer_context_active_PLACEHOLDER(scene);
 
-	return ED_space_image_check_show_maskedit(sl, sima);
+	return ED_space_image_check_show_maskedit(scene_layer, sima);
 }
 
 static void rna_SpaceImageEditor_image_set(PointerRNA *ptr, PointerRNA value)
@@ -1323,9 +1323,9 @@ static void rna_SpaceDopeSheetEditor_action_set(PointerRNA *ptr, PointerRNA valu
 static void rna_SpaceDopeSheetEditor_action_update(bContext *C, PointerRNA *ptr)
 {
 	SpaceAction *saction = (SpaceAction *)(ptr->data);
-	SceneLayer *sl = CTX_data_scene_layer(C);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
 	Main *bmain = CTX_data_main(C);
-	Object *obact = OBACT_NEW(sl);
+	Object *obact = OBACT_NEW(scene_layer);
 
 	/* we must set this action to be the one used by active object (if not pinned) */
 	if (obact /* && saction->pin == 0*/) {
@@ -1400,8 +1400,8 @@ static void rna_SpaceDopeSheetEditor_action_update(bContext *C, PointerRNA *ptr)
 static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr)
 {
 	SpaceAction *saction = (SpaceAction *)(ptr->data);
-	SceneLayer *sl = CTX_data_scene_layer(C);
-	Object *obact = OBACT_NEW(sl);
+	SceneLayer *scene_layer = CTX_data_scene_layer(C);
+	Object *obact = OBACT_NEW(scene_layer);
 
 	/* special exceptions for ShapeKey Editor mode */
 	if (saction->mode == SACTCONT_SHAPEKEY) {
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index 040273925cb..06ffc2ee292 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -248,8 +248,8 @@ void rna_TextureSlot_update(bContext *C, PointerRNA *ptr)
 		{
 			Scene *scene = CTX_data_scene(C);
 			MTex *mtex = ptr->data;
-			SceneLayer *sl = CTX_data_scene_layer(C);
-			BKE_paint_invalidate_overlay_tex(scene, sl, mtex->tex);
+			SceneLayer *scene_layer = CTX_data_scene_layer(C);
+			BKE_paint_invalidate_overlay_tex(scene, scene_layer, mtex->tex);
 			WM_main_add_notifier(NC_BRUSH, id);
 			break;
 		}