[Bf-blender-cvs] [741ed5fcd2e] master: Fix Cycles compile error after last own commit

[Julian Eisel]

Commit: 741ed5fcd2e2ede686f2a024181cb6b769745cdb
Author: Julian Eisel
Date:   Sat Jan 8 00:25:59 2022 +0100
Branches: master
https://developer.blender.org/rB741ed5fcd2e2ede686f2a024181cb6b769745cdb

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.

===================================================================

M	source/blender/editors/space_node/node_add.cc
M	source/blender/makesrna/RNA_types.h

===================================================================

diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc
index 09652be3226..be29c125e5a 100644
--- a/source/blender/editors/space_node/node_add.cc
+++ b/source/blender/editors/space_node/node_add.cc
@@ -524,7 +524,7 @@ void NODE_OT_add_object(wmOperatorType *ot)
                      "Session UUID of the data-block to assign",
                      INT32_MIN,
                      INT32_MAX);
-  RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
+  RNA_def_property_flag(prop, (PropertyFlag)(PROP_HIDDEN | PROP_SKIP_SAVE));
 }
 
 /** \} */
@@ -631,7 +631,7 @@ void NODE_OT_add_texture(wmOperatorType *ot)
                      "Session UUID of the data-block to assign",
                      INT32_MIN,
                      INT32_MAX);
-  RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
+  RNA_def_property_flag(prop, (PropertyFlag)(PROP_HIDDEN | PROP_SKIP_SAVE));
 }
 
 /** \} */
@@ -743,7 +743,7 @@ void NODE_OT_add_collection(wmOperatorType *ot)
                      "Session UUID of the data-block to assign",
                      INT32_MIN,
                      INT32_MAX);
-  RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
+  RNA_def_property_flag(prop, (PropertyFlag)(PROP_HIDDEN | PROP_SKIP_SAVE));
 }
 
 /** \} */
@@ -949,7 +949,7 @@ void NODE_OT_add_mask(wmOperatorType *ot)
                      "Session UUID of the data-block to assign",
                      INT32_MIN,
                      INT32_MAX);
-  RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
+  RNA_def_property_flag(prop, (PropertyFlag)(PROP_HIDDEN | PROP_SKIP_SAVE));
 }
 
 /** \} */
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.