diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
| commit | a5b4b0f21c1ae8c96e4fea9abdcfac2fab1cf300 (patch) | |
| tree | 0658d8bdfb8ec03652aa04f82ee8a4d243ec6370 /source/blender/makesrna/RNA_types.h | |
| parent | d68f698cf0321477c0734474150eb4bc43c4e85f (diff) | |
| parent | abcda06934aba054de8540b66b13c2bbc5f8f515 (diff) | |
Merge branch '28' into custom-manipulatorscustom-manipulators
Diffstat (limited to 'source/blender/makesrna/RNA_types.h')
| -rw-r--r-- | source/blender/makesrna/RNA_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 99ef0f9c8c4..2ec25bc8e46 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -178,7 +178,7 @@ typedef enum PropertyFlag { * after every typed char, instead of waiting final validation. Used e.g. for text searchbox. * It will also cause UI_BUT_VALUE_CLEAR to be set for text buttons. We could add an own flag * for search/filter properties, but this works just fine for now. */ - PROP_TEXTEDIT_UPDATE = (1 << 31), + PROP_TEXTEDIT_UPDATE = (1u << 31), /* icon */ PROP_ICONS_CONSECUTIVE = (1 << 12), @@ -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); |