[Bf-blender-cvs] [99f51804353] blender2.8: New view layers should be named "View Layer" (not Render Layer)

[Dalai Felinto]

Commit: 99f518043537238577b332be64f83a812fbb4253
Author: Dalai Felinto
Date:   Thu Nov 23 08:31:15 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB99f518043537238577b332be64f83a812fbb4253

New view layers should be named "View Layer" (not Render Layer)

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

M	source/blender/blenkernel/intern/layer.c
M	source/blender/blenkernel/intern/scene.c

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

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 5e07ad02a07..18f80a6964e 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -109,32 +109,32 @@ ViewLayer *BKE_view_layer_context_active_PLACEHOLDER(const Scene *scene)
 ViewLayer *BKE_view_layer_add(Scene *scene, const char *name)
 {
 	if (!name) {
-		name = DATA_("Render Layer");
+		name = DATA_("View Layer");
 	}
 
 	IDPropertyTemplate val = {0};
-	ViewLayer *sl = MEM_callocN(sizeof(ViewLayer), "Scene Layer");
-	sl->flag = VIEW_LAYER_RENDER | VIEW_LAYER_FREESTYLE;
+	ViewLayer *view_layer = MEM_callocN(sizeof(ViewLayer), "View Layer");
+	view_layer->flag = VIEW_LAYER_RENDER | VIEW_LAYER_FREESTYLE;
 
-	sl->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
-	layer_engine_settings_init(sl->properties, false);
+	view_layer->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
+	layer_engine_settings_init(view_layer->properties, false);
 
-	BLI_addtail(&scene->view_layers, sl);
+	BLI_addtail(&scene->view_layers, view_layer);
 
 	/* unique name */
-	BLI_strncpy_utf8(sl->name, name, sizeof(sl->name));
-	BLI_uniquename(&scene->view_layers, sl, DATA_("ViewLayer"), '.', offsetof(ViewLayer, name), sizeof(sl->name));
+	BLI_strncpy_utf8(view_layer->name, name, sizeof(view_layer->name));
+	BLI_uniquename(&scene->view_layers, view_layer, DATA_("ViewLayer"), '.', offsetof(ViewLayer, name), sizeof(view_layer->name));
 
 	SceneCollection *sc = BKE_collection_master(scene);
-	layer_collection_add(sl, NULL, sc);
+	layer_collection_add(view_layer, NULL, sc);
 
 	/* Pure rendering pipeline settings. */
-	sl->layflag = 0x7FFF;   /* solid ztra halo edge strand */
-	sl->passflag = SCE_PASS_COMBINED | SCE_PASS_Z;
-	sl->pass_alpha_threshold = 0.5f;
-	BKE_freestyle_config_init(&sl->freestyle_config);
+	view_layer->layflag = 0x7FFF;   /* solid ztra halo edge strand */
+	view_layer->passflag = SCE_PASS_COMBINED | SCE_PASS_Z;
+	view_layer->pass_alpha_threshold = 0.5f;
+	BKE_freestyle_config_init(&view_layer->freestyle_config);
 
-	return sl;
+	return view_layer;
 }
 
 /**
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index b4e7c14e30c..f42270d05f0 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1032,7 +1032,7 @@ void BKE_scene_init(Scene *sce)
 	sce->layer_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
 	BKE_view_layer_engine_settings_create(sce->layer_properties);
 
-	BKE_view_layer_add(sce, "Render Layer");
+	BKE_view_layer_add(sce, "View Layer");
 }
 
 Scene *BKE_scene_add(Main *bmain, const char *name)