diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-11 17:23:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-11 17:23:49 +0300 |
| commit | 9567529b8f854449e10d59f793f0a225b9a4c495 (patch) | |
| tree | 198842c6572ae2b59fca41621e3dbd561a5817ea /source/blender/makesrna/RNA_define.h | |
| parent | d9323a537ffc070081bd2353f8e918b528e8c581 (diff) | |
| parent | e6da7bb75c8eff13185a56a144dce920b3886ecb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/RNA_define.h')
| -rw-r--r-- | source/blender/makesrna/RNA_define.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/RNA_define.h b/source/blender/makesrna/RNA_define.h index 54938b236d5..0be3d2fc3c8 100644 --- a/source/blender/makesrna/RNA_define.h +++ b/source/blender/makesrna/RNA_define.h @@ -70,7 +70,8 @@ void RNA_def_struct_refine_func(StructRNA *srna, const char *refine); void RNA_def_struct_idprops_func(StructRNA *srna, const char *refine); void RNA_def_struct_register_funcs(StructRNA *srna, const char *reg, const char *unreg, const char *instance); void RNA_def_struct_path_func(StructRNA *srna, const char *path); -void RNA_def_struct_identifier(StructRNA *srna, const char *identifier); +void RNA_def_struct_identifier_no_struct_map(StructRNA *srna, const char *identifier); +void RNA_def_struct_identifier(BlenderRNA *brna, StructRNA *srna, const char *identifier); void RNA_def_struct_ui_text(StructRNA *srna, const char *name, const char *description); void RNA_def_struct_ui_icon(StructRNA *srna, int icon); void RNA_struct_free_extension(StructRNA *srna, ExtensionRNA *ext); |