diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-06-19 02:53:49 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-06-19 02:53:49 +0400 |
| commit | 4d141cf80821fa0dc9533f24583fbf7e53eab5b4 (patch) | |
| tree | f0096d5ec7281574805a9282cdbea00f827041cb /source/blender/makesrna/intern/rna_main_api.c | |
| parent | df0b629e246cc7fa091b00b97a2158877bd10ce3 (diff) | |
| parent | 615af47559f7c1bf0aa13011d21ed972f433613c (diff) | |
Merged changes in the trunk up to revision 29550.
Diffstat (limited to 'source/blender/makesrna/intern/rna_main_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_main_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index c9e17a562af..0dbaaa87a99 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -929,7 +929,7 @@ void RNA_def_main_texts(BlenderRNA *brna, PropertyRNA *cprop) func= RNA_def_function(srna, "load", "rna_Main_texts_load"); RNA_def_function_flag(func, FUNC_USE_REPORTS); RNA_def_function_ui_description(func, "Add a new text to the main database from a file"); - parm= RNA_def_string(func, "path", "Path", FILE_MAXDIR + FILE_MAXFILE, "", "path for the datablock."); + parm= RNA_def_string(func, "filepath", "Path", FILE_MAXDIR + FILE_MAXFILE, "", "path for the datablock."); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ parm= RNA_def_pointer(func, "text", "Text", "", "New text datablock."); |