blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

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.
This commit is contained in:
Julian Eisel 2022-01-08 00:25:59 +01:00
parent 34e84d0ee8
commit 741ed5fcd2
Notes: blender-bot 2023-04-14 09:18:04 +02:00 
Referenced by issue #96133, MacOS desktop freeze and crash on 3.1 beta up to 3.2.2 when moving mesh in Cycles Rendered view (Cycles CPU mode)
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_node/node_add.cc
View File

@ -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));
}
/** \} */

2
source/blender/makesrna/RNA_types.h
View File

@ -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.