[Bf-blender-cvs] [4404703] soc-2016-layer_manager: Minor edits to object layer name management

[Julian Eisel]

Commit: 4404703b93aa60fbda9d14775592139a1de3333c
Author: Julian Eisel
Date:   Tue May 24 15:15:15 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rB4404703b93aa60fbda9d14775592139a1de3333c

Minor edits to object layer name management

Default object layer name is "Untitled Layer" for now.

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

M	source/blender/editors/include/ED_object.h
M	source/blender/editors/object/object_layer.c
M	source/blender/editors/space_layers/layers_ops.c

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

diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 8a83175..f781736 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -179,7 +179,7 @@ void undo_push_lattice(struct bContext *C, const char *name);
 void ED_lattice_flags_set(struct Object *obedit, int flag);
 
 /* object_layer.c */
-void ED_object_layer_add(struct LayerTree *ltree);
+void ED_object_layer_add(struct LayerTree *ltree, const char *name);
 
 /* object_modifier.c */
 enum {
diff --git a/source/blender/editors/object/object_layer.c b/source/blender/editors/object/object_layer.c
index 4d7e4e2..bc0c831 100644
--- a/source/blender/editors/object/object_layer.c
+++ b/source/blender/editors/object/object_layer.c
@@ -41,6 +41,7 @@
 
 #include "UI_interface.h"
 
+#define OBJECTLAYER_DEFAULT_NAME "Untitled Layer"
 
 static void object_layer_draw(LayerTreeItem *litem, uiLayout *layout)
 {
@@ -52,9 +53,13 @@ static void object_layer_draw_settings(LayerTreeItem *UNUSED(litem), uiLayout *U
 	/* TODO */
 }
 
-void ED_object_layer_add(LayerTree *ltree)
+/**
+ * Add an object layer to \a ltree.
+ * \param name: Name of the layer to add. NULL for default ("Untitled Layer").
+ */
+void ED_object_layer_add(LayerTree *ltree, const char *name)
 {
 	BKE_layeritem_add(
-	            ltree, NULL, LAYER_TREETYPE_OBJECT, "Layer",
+	            ltree, NULL, LAYER_TREETYPE_OBJECT, name ? name : OBJECTLAYER_DEFAULT_NAME,
 	            NULL, object_layer_draw, object_layer_draw_settings);
 }
diff --git a/source/blender/editors/space_layers/layers_ops.c b/source/blender/editors/space_layers/layers_ops.c
index 194219b..18283ae 100644
--- a/source/blender/editors/space_layers/layers_ops.c
+++ b/source/blender/editors/space_layers/layers_ops.c
@@ -41,7 +41,7 @@ static int layer_add_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *
 {
 	if (true) { /* context check (like: slayer->context == SLAYER_CONTEXT_OBJECT) */
 		Scene *scene = CTX_data_scene(C);
-		ED_object_layer_add(scene->object_layers);
+		ED_object_layer_add(scene->object_layers, NULL);
 	}
 
 	WM_event_add_notifier(C, NC_SCENE | ND_LAYER, NULL);