[Bf-blender-cvs] [64e8d0eaa64] greasepencil-object: RNA: Replace material api

[Antonio Vazquez]

Commit: 64e8d0eaa647a462046fa137da52d399cbcbbeb8
Author: Antonio Vazquez
Date:   Mon May 14 19:54:28 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB64e8d0eaa647a462046fa137da52d399cbcbbeb8

RNA: Replace material api

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

M	source/blender/makesrna/intern/rna_main_api.c

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

diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 38912ec2ab9..9d9064bd15c 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -269,14 +269,9 @@ static Material *rna_Main_materials_new(Main *bmain, const char *name)
 	return (Material *)id;
 }
 
-static Material *rna_Main_materials_new_greasepencil(Main *bmain, const char *name)
+static void rna_Main_materials_gpencil_data(Main *bmain, struct PointerRNA *ma)
 {
-	char safe_name[MAX_ID_NAME - 2];
-	rna_idname_validate(name, safe_name);
-
-	ID *id = (ID *)BKE_material_add_gpencil(bmain, safe_name);
-	id_us_min(id);
-	return (Material *)id;
+	BKE_material_init_gpencil_settings((Material *)ma);
 }
 
 static const EnumPropertyItem *rna_Main_nodetree_type_itemf(bContext *UNUSED(C), PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
@@ -815,13 +810,10 @@ void RNA_def_main_materials(BlenderRNA *brna, PropertyRNA *cprop)
 	parm = RNA_def_pointer(func, "material", "Material", "", "New material data-block");
 	RNA_def_function_return(func, parm);
 
-	func = RNA_def_function(srna, "new_greasepencil", "rna_Main_materials_new_greasepencil");
-	RNA_def_function_ui_description(func, "Add a new grease pencil material to the main database");
-	parm = RNA_def_string(func, "name", "Material", 0, "", "New name for the data-block");
-	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
-	/* return type */
-	parm = RNA_def_pointer(func, "material", "Material", "", "New material data-block");
-	RNA_def_function_return(func, parm);
+	func = RNA_def_function(srna, "create_gpencil_data", "rna_Main_materials_gpencil_data");
+	RNA_def_function_ui_description(func, "Add grease pencil material settings");
+	parm = RNA_def_pointer(func, "material", "Material", "", "Material");
+	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
 
 	func = RNA_def_function(srna, "remove", "rna_Main_ID_remove");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);