Merge branch 'master' into blender2.8
This commit is contained in:
@@ -257,7 +257,7 @@ typedef enum eAnimFilter_Flags {
|
||||
ANIMFILTER_TMP_PEEK = (1 << 30),
|
||||
|
||||
/* ignore ONLYSEL flag from filterflag, (internal use only!) */
|
||||
ANIMFILTER_TMP_IGNORE_ONLYSEL = (1 << 31)
|
||||
ANIMFILTER_TMP_IGNORE_ONLYSEL = (1u << 31)
|
||||
} eAnimFilter_Flags;
|
||||
|
||||
/* ---------- Flag Checking Macros ------------ */
|
||||
|
||||
@@ -405,7 +405,7 @@ enum {
|
||||
FILTER_ID_PA = (1 << 27),
|
||||
FILTER_ID_CF = (1 << 28),
|
||||
FILTER_ID_WS = (1 << 29),
|
||||
FILTER_ID_LP = (1 << 31),
|
||||
FILTER_ID_LP = (1u << 31),
|
||||
};
|
||||
|
||||
/* IMPORTANT: this enum matches the order currently use in set_listbasepointers,
|
||||
|
||||
@@ -530,7 +530,7 @@ typedef enum eActionGroup_Flag {
|
||||
AGRP_MODIFIERS_OFF = (1 << 7),
|
||||
|
||||
AGRP_TEMP = (1 << 30),
|
||||
AGRP_MOVED = (1 << 31)
|
||||
AGRP_MOVED = (1u << 31)
|
||||
} eActionGroup_Flag;
|
||||
|
||||
|
||||
@@ -773,7 +773,7 @@ typedef enum ACHAN_FLAG {
|
||||
ACHAN_EXPANDED = (1 << 4),
|
||||
ACHAN_SHOWIPO = (1 << 5),
|
||||
ACHAN_SHOWCONS = (1 << 6),
|
||||
ACHAN_MOVED = (1 << 31)
|
||||
ACHAN_MOVED = (1u << 31)
|
||||
} ACHAN_FLAG;
|
||||
|
||||
#endif /* __DNA_ACTION_TYPES_H__ */
|
||||
|
||||
@@ -685,7 +685,7 @@ typedef enum eNlaStrip_Flag {
|
||||
/* temporary editing flags */
|
||||
/* NLA-Strip is really just a temporary meta used to facilitate easier transform code */
|
||||
NLASTRIP_FLAG_TEMP_META = (1<<30),
|
||||
NLASTRIP_FLAG_EDIT_TOUCHED = (1<<31)
|
||||
NLASTRIP_FLAG_EDIT_TOUCHED = (1u << 31)
|
||||
} eNlaStrip_Flag;
|
||||
|
||||
/* NLA Strip Type */
|
||||
|
||||
@@ -210,7 +210,7 @@ typedef enum BrushFlags {
|
||||
BRUSH_CUSTOM_ICON = (1 << 28),
|
||||
BRUSH_LINE = (1 << 29),
|
||||
BRUSH_ABSOLUTE_JITTER = (1 << 30),
|
||||
BRUSH_CURVE = (1 << 31)
|
||||
BRUSH_CURVE = (1u << 31)
|
||||
} BrushFlags;
|
||||
|
||||
typedef enum {
|
||||
|
||||
@@ -98,7 +98,7 @@ typedef enum ModifierMode {
|
||||
eModifierMode_Expanded = (1 << 4),
|
||||
eModifierMode_Virtual = (1 << 5),
|
||||
eModifierMode_ApplyOnSpline = (1 << 6),
|
||||
eModifierMode_DisableTemporary = (1 << 31)
|
||||
eModifierMode_DisableTemporary = (1u << 31)
|
||||
} ModifierMode;
|
||||
|
||||
typedef struct ModifierData {
|
||||
@@ -1515,7 +1515,7 @@ enum {
|
||||
MOD_DATATRANSFER_USE_VERT = 1 << 28,
|
||||
MOD_DATATRANSFER_USE_EDGE = 1 << 29,
|
||||
MOD_DATATRANSFER_USE_LOOP = 1 << 30,
|
||||
MOD_DATATRANSFER_USE_POLY = 1 << 31,
|
||||
MOD_DATATRANSFER_USE_POLY = 1u << 31,
|
||||
};
|
||||
|
||||
/* Set Split Normals modifier */
|
||||
|
||||
@@ -376,7 +376,7 @@ enum {
|
||||
/* uiList filter orderby type */
|
||||
enum {
|
||||
UILST_FLT_SORT_ALPHA = 1 << 0,
|
||||
UILST_FLT_SORT_REVERSE = 1 << 31 /* Special value, bitflag used to reverse order! */
|
||||
UILST_FLT_SORT_REVERSE = 1u << 31 /* Special value, bitflag used to reverse order! */
|
||||
};
|
||||
|
||||
#define UILST_FLT_SORT_MASK (((unsigned int)UILST_FLT_SORT_REVERSE) - 1)
|
||||
|
||||
@@ -442,7 +442,7 @@ enum {
|
||||
/* access scene strips directly (like a metastrip) */
|
||||
SEQ_SCENE_STRIPS = (1 << 30),
|
||||
|
||||
SEQ_INVALID_EFFECT = (1 << 31),
|
||||
SEQ_INVALID_EFFECT = (1u << 31),
|
||||
};
|
||||
|
||||
/* StripProxy->storage */
|
||||
|
||||
@@ -744,7 +744,7 @@ typedef enum eFileSel_File_Types {
|
||||
FILE_TYPE_ALEMBIC = (1 << 16),
|
||||
|
||||
FILE_TYPE_DIR = (1 << 30), /* An FS directory (i.e. S_ISDIR on its path is true). */
|
||||
FILE_TYPE_BLENDERLIB = (1 << 31),
|
||||
FILE_TYPE_BLENDERLIB = (1u << 31),
|
||||
} eFileSel_File_Types;
|
||||
|
||||
/* Selection Flags in filesel: struct direntry, unsigned char selflag */
|
||||
|
||||
@@ -691,7 +691,7 @@ typedef enum eUserpref_UI_Flag {
|
||||
USER_HIDE_RECENT = (1 << 28),
|
||||
USER_SHOW_THUMBNAILS = (1 << 29),
|
||||
USER_QUIT_PROMPT = (1 << 30),
|
||||
USER_HIDE_SYSTEM_BOOKMARKS = (1 << 31)
|
||||
USER_HIDE_SYSTEM_BOOKMARKS = (1u << 31)
|
||||
} eUserpref_UI_Flag;
|
||||
|
||||
/* UserDef.uiflag2 */
|
||||
|
||||
@@ -178,7 +178,7 @@ typedef enum PropertyFlag {
|
||||
* after every typed char, instead of waiting final validation. Used e.g. for text searchbox.
|
||||
* It will also cause UI_BUT_VALUE_CLEAR to be set for text buttons. We could add an own flag
|
||||
* for search/filter properties, but this works just fine for now. */
|
||||
PROP_TEXTEDIT_UPDATE = (1 << 31),
|
||||
PROP_TEXTEDIT_UPDATE = (1u << 31),
|
||||
|
||||
/* icon */
|
||||
PROP_ICONS_CONSECUTIVE = (1 << 12),
|
||||
|
||||
Reference in New Issue
Block a user