diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-11 13:00:11 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-11 13:00:11 +0400 |
commit | 7839e81ed5792cb20bde88d1d972d8e75d4021aa (patch) | |
tree | 4317ecac16046306a48a842be7674c25e903b0e9 /source/blender/makesdna | |
parent | 87abf432517a545e141c2473aebf506c5eebb613 (diff) | |
parent | 8015b7a4a5bcf39250b96bc3744498c50d0c641c (diff) |
Merging r47702 through r47726 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 0b5b2177342..cb905d7f768 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -491,7 +491,7 @@ typedef enum eSpaceSeq_Flag { SEQ_MARKER_TRANS = (1 << 1), SEQ_DRAW_COLOR_SEPARATED = (1 << 2), SEQ_DRAW_SAFE_MARGINS = (1 << 3), - SEQ_DRAW_GPENCIL = (1 << 4), /* DEPRECATED */ +/* SEQ_DRAW_GPENCIL = (1 << 4), */ /* DEPRECATED */ SEQ_NO_DRAW_CFRANUM = (1 << 5), } eSpaceSeq_Flag; @@ -746,7 +746,7 @@ typedef enum eSpaceImage_Flag { SI_DRAW_TILE = (1 << 19), SI_SMOOTH_UV = (1 << 20), SI_DRAW_STRETCH = (1 << 21), - SI_DISPGP = (1 << 22), /* DEPRECATED */ +/* SI_DISPGP = (1 << 22), */ /* DEPRECATED */ SI_DRAW_OTHER = (1 << 23), SI_COLOR_CORRECTION = (1 << 24), @@ -876,7 +876,7 @@ typedef struct SpaceNode { /* snode->flag */ typedef enum eSpaceNode_Flag { SNODE_BACKDRAW = (1 << 1), - SNODE_DISPGP = (1 << 2), /* XXX: Grease Pencil - deprecated? */ +/* SNODE_DISPGP = (1 << 2), */ /* XXX: Grease Pencil - deprecated? */ SNODE_USE_ALPHA = (1 << 3), SNODE_SHOW_ALPHA = (1 << 4), SNODE_AUTO_RENDER = (1 << 5), |