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/editors/space_node/node_add.cc | |
| 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/editors/space_node/node_add.cc')
| -rw-r--r-- | source/blender/editors/space_node/node_add.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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)); } /** \} */ |