[Bf-blender-cvs] [09d26cab0bd] blender2.8: Cleanup: Use full name for scene_layer in alembic

[Sergey Sharybin]

Commit: 09d26cab0bdde16529debd3e0271252012ba69eb
Author: Sergey Sharybin
Date:   Thu Nov 9 15:45:09 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB09d26cab0bdde16529debd3e0271252012ba69eb

Cleanup: Use full name for scene_layer in alembic

===================================================================

M	source/blender/alembic/intern/abc_exporter.cc
M	source/blender/alembic/intern/abc_exporter.h
M	source/blender/alembic/intern/alembic_capi.cc

===================================================================

diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index af6cf655652..41769015761 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -364,7 +364,7 @@ void AbcExporter::operator()(Main *bmain, float &progress, bool &was_canceled)
 
 void AbcExporter::createTransformWritersHierarchy(EvaluationContext *eval_ctx)
 {
-	for (Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
+	for (Base *base = static_cast<Base *>(m_settings.scene_layer->object_bases.first); base; base = base->next) {
 		Object *ob = base->object;
 
 		if (export_object(&m_settings, base, false)) {
@@ -495,7 +495,7 @@ AbcTransformWriter * AbcExporter::createTransformWriter(EvaluationContext *eval_
 
 void AbcExporter::createShapeWriters(EvaluationContext *eval_ctx)
 {
-	for (Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
+	for (Base *base = static_cast<Base *>(m_settings.scene_layer->object_bases.first); base; base = base->next) {
 		exploreObject(eval_ctx, base, NULL);
 	}
 }
diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h
index 816e2db725b..7e25384ff0d 100644
--- a/source/blender/alembic/intern/abc_exporter.h
+++ b/source/blender/alembic/intern/abc_exporter.h
@@ -46,7 +46,7 @@ struct ExportSettings {
 	ExportSettings();
 
 	Scene *scene;
-	SceneLayer *sl;  // Scene layer to export; all its objects will be exported, unless selected_only=true
+	SceneLayer *scene_layer;  // Scene layer to export; all its objects will be exported, unless selected_only=true
 	Depsgraph *depsgraph;
 	SimpleLogger logger;
 
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index e4d6357a1be..c2fbed471b8 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -347,7 +347,7 @@ bool ABC_export(
 	 * Later in the 2.8 development process this may be replaced by using
 	 * a specific collection for Alembic I/O, which can then be toggled
 	 * between "real" objects and cached Alembic files. */
-	job->settings.sl = CTX_data_scene_layer(C);
+	job->settings.scene_layer = CTX_data_scene_layer(C);
 
 	job->settings.frame_start = params->frame_start;
 	job->settings.frame_end = params->frame_end;
@@ -837,16 +837,16 @@ static void import_endjob(void *user_data)
 		/* Add object to scene. */
 		Base *base;
 		LayerCollection *lc;
-		SceneLayer *sl = data->scene_layer;
+		SceneLayer *scene_layer = data->scene_layer;
 
-		BKE_scene_layer_base_deselect_all(sl);
+		BKE_scene_layer_base_deselect_all(scene_layer);
 
-		lc = BKE_layer_collection_get_active(sl);
+		lc = BKE_layer_collection_get_active(scene_layer);
 		if (lc == NULL) {
-			BLI_assert(BLI_listbase_count_ex(&sl->layer_collections, 1) == 0);
+			BLI_assert(BLI_listbase_count_ex(&scene_layer->layer_collections, 1) == 0);
 			/* when there is no collection linked to this SceneLayer, create one */
 			SceneCollection *sc = BKE_collection_add(data->scene, NULL, NULL);
-			lc = BKE_collection_link(sl, sc);
+			lc = BKE_collection_link(scene_layer, sc);
 		}
 
 		for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) {
@@ -855,8 +855,8 @@ static void import_endjob(void *user_data)
 
 			BKE_collection_object_add(data->scene, lc->scene_collection, ob);
 
-			base = BKE_scene_layer_base_find(sl, ob);
-			BKE_scene_layer_base_select(sl, base);
+			base = BKE_scene_layer_base_find(scene_layer, ob);
+			BKE_scene_layer_base_select(scene_layer, base);
 
 			DEG_id_tag_update_ex(data->bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 		}