diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-06 12:31:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-06 12:31:58 +0300 |
| commit | 8a3adaa48568382c1d0e67fabb8ec3d07b94dd42 (patch) | |
| tree | 6211427d0fe723e99c0f6e5a6779594d31254171 /source/blender/makesdna | |
| parent | 5f669240663649ee5532f935a8178bf9db7b10cf (diff) | |
| parent | bb98eef777cbc3484bfcb50ea460b9c5622e9200 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_node/drawnode.c
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 31a5931dde4..832002d63ee 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -503,7 +503,7 @@ enum { }; enum { - CMP_NODEFLAG_MASK_AA = (1 << 0), + /* CMP_NODEFLAG_MASK_AA = (1 << 0), */ /* DEPRECATED */ CMP_NODEFLAG_MASK_NO_FEATHER = (1 << 1), CMP_NODEFLAG_MASK_MOTION_BLUR = (1 << 2), |