From 741ed5fcd2e2ede686f2a024181cb6b769745cdb Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Sat, 8 Jan 2022 00:25:59 +0100 Subject: 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. --- source/blender/makesrna/RNA_types.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'source/blender/makesrna/RNA_types.h') 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. -- cgit v1.2.3