diff options
| author | Julian Eisel <julian@blender.org> | 2022-01-08 02:25:59 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-01-08 02:28:19 +0300 |
| commit | 741ed5fcd2e2ede686f2a024181cb6b769745cdb (patch) | |
| tree | a745afab3ab698e845ca36e5ba2a29d5c1738bc2 /source/blender/makesrna/RNA_types.h | |
| parent | 34e84d0ee8a238d1ce46dc06e30c2c56693285dd (diff) | |
Fix Cycles compile error after last own commit
We can't include `BLI_utildefines.h` in `RNA_types.h` since Cycles includes
that, but duplicates some of the util defines. So you'd have duplicated
definitions.
Diffstat (limited to 'source/blender/makesrna/RNA_types.h')
| -rw-r--r-- | source/blender/makesrna/RNA_types.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 8a143a9f6ea..2d499dd113f 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -23,7 +23,6 @@ #define __RNA_TYPES_H__ #include "../blenlib/BLI_sys_types.h" -#include "BLI_utildefines.h" #ifdef __cplusplus extern "C" { @@ -315,7 +314,6 @@ typedef enum PropertyFlag { */ PROP_NO_DEG_UPDATE = (1 << 30), } PropertyFlag; -ENUM_OPERATORS(PropertyFlag, PROP_TEXTEDIT_UPDATE); /** * Flags related to comparing and overriding RNA properties. |