diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-31 19:30:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-31 19:30:48 +0300 |
| commit | c843e848921c2361b69dfaeab9c2984069cb7f3b (patch) | |
| tree | 174b16a5c9fa3d5dbb0a6f084e937e4bc8f096bf /source/blender/makesrna/RNA_types.h | |
| parent | 323a7ab944132335f27ba21519df161d7a3351c9 (diff) | |
| parent | 0bbae3f3f6593614e2056518f534c42a30a47ebd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/RNA_types.h')
| -rw-r--r-- | source/blender/makesrna/RNA_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 2dac9f67b7a..2ec25bc8e46 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -437,6 +437,8 @@ typedef enum StructFlag { STRUCT_NO_IDPROPERTIES = (1 << 6), /* Menus and Panels don't need properties */ STRUCT_NO_DATABLOCK_IDPROPERTIES = (1 << 7), /* e.g. for Operator */ STRUCT_CONTAINS_DATABLOCK_IDPROPERTIES = (1 << 8), /* for PropertyGroup which contains pointers to datablocks */ + STRUCT_PUBLIC_NAMESPACE = (1 << 9), /* Added to type-map #BlenderRNA.structs_map */ + STRUCT_PUBLIC_NAMESPACE_INHERIT = (1 << 10), /* All subtypes are added too. */ } StructFlag; typedef int (*StructValidateFunc)(struct PointerRNA *ptr, void *data, int *have_function); |