diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-06 15:13:32 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-06 15:13:32 +0300 |
| commit | 33efa9eeb63db672d9da97b68718aefb14b98f64 (patch) | |
| tree | aa3e0604a33ff8a498184615e52a607bba7241a6 /source/blender/makesrna/intern/rna_main.c | |
| parent | 29fafab10702d83954999342b9823eedc68fdea1 (diff) | |
| parent | a2b128aa359627cc1b6d464148cb3fbc30fd32b0 (diff) | |
Merged changes in the trunk up to revision 35367.
To branch builders: From this revision Python 3.2 will be used.
Don't forget svn update in the "lib" directory as well.
Diffstat (limited to 'source/blender/makesrna/intern/rna_main.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c index db48ac23101..b83820cb59f 100644 --- a/source/blender/makesrna/intern/rna_main.c +++ b/source/blender/makesrna/intern/rna_main.c @@ -22,6 +22,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/makesrna/intern/rna_main.c + * \ingroup RNA + */ + + #include <stdlib.h> #include <string.h> @@ -283,7 +288,7 @@ void RNA_def_main(BlenderRNA *brna) {"brushes", "Brush", "rna_Main_brush_begin", "Brushes", "Brush datablocks.", RNA_def_main_brushes}, {"worlds", "World", "rna_Main_world_begin", "Worlds", "World datablocks.", RNA_def_main_worlds}, {"groups", "Group", "rna_Main_group_begin", "Groups", "Group datablocks.", RNA_def_main_groups}, - {"shape_keys", "Key", "rna_Main_key_begin", "Keys", "Key datablocks.", NULL}, + {"shape_keys", "Key", "rna_Main_key_begin", "Shape Keys", "Shape Key datablocks.", NULL}, {"scripts", "ID", "rna_Main_script_begin", "Scripts", "Script datablocks (DEPRECATED).", NULL}, {"texts", "Text", "rna_Main_text_begin", "Texts", "Text datablocks.", RNA_def_main_texts}, {"sounds", "Sound", "rna_Main_sound_begin", "Sounds", "Sound datablocks.", RNA_def_main_sounds}, |