diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-07-29 01:43:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-29 01:49:34 +0300 |
commit | 1ee11b50854c6907fc9a60686db93ca3aa0a6342 (patch) | |
tree | 0454802e8275ef5798a85004059b7e6449c8a62c /source/blender/makesdna/DNA_action_types.h | |
parent | 361acb69916372a1388cafe57337194cbbe8c3e8 (diff) | |
parent | fb1cd7648f912123558dbe26387639556900a78c (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_action_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 90d6bbb4f1e..7809d2d1c4a 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -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__ */ |