diff options
| author | YimingWu <xp8110@outlook.com> | 2019-09-01 17:38:02 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2019-09-01 17:38:02 +0300 |
| commit | d543acbdf74d5ba4dbc99014540e26f81f7c170f (patch) | |
| tree | de08eb41ada6e15f9b9496b00379baff569586f4 /source/blender/makesdna/DNA_space_types.h | |
| parent | 88fc7e401a1fb06a74bcf888bbc7f56153c82e30 (diff) | |
| parent | 18d4ad5a59d32922f9d70b0412da0c830baceb17 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-staging
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 0acc4f73997..497f94a7426 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -429,8 +429,7 @@ typedef enum eGraphEdit_Flag { SIPO_NOTRANSKEYCULL = (1 << 1), /* don't show any keyframe handles at all */ SIPO_NOHANDLES = (1 << 2), - /* don't show current frame number beside indicator line */ - SIPO_NODRAWCFRANUM = (1 << 3), + /* SIPO_NODRAWCFRANUM = (1 << 3), DEPRECATED */ /* show timing in seconds instead of frames */ SIPO_DRAWTIME = (1 << 4), /* only show keyframes for selected F-Curves */ @@ -505,8 +504,7 @@ typedef enum eSpaceNla_Flag { /* draw timing in seconds instead of frames */ SNLA_DRAWTIME = (1 << 2), SNLA_FLAG_UNUSED_3 = (1 << 3), - /* don't draw frame number beside frame indicator */ - SNLA_NODRAWCFRANUM = (1 << 4), + /* SNLA_NODRAWCFRANUM = (1 << 4), DEPRECATED */ /* don't draw influence curves on strips */ SNLA_NOSTRIPCURVES = (1 << 5), /* don't perform realtime updates */ @@ -590,7 +588,7 @@ typedef enum eSpaceSeq_Flag { SEQ_DRAW_COLOR_SEPARATED = (1 << 2), SEQ_SHOW_SAFE_MARGINS = (1 << 3), SEQ_SHOW_GPENCIL = (1 << 4), - SEQ_NO_DRAW_CFRANUM = (1 << 5), + /* SEQ_NO_DRAW_CFRANUM = (1 << 5), DEPRECATED */ SEQ_USE_ALPHA = (1 << 6), /* use RGBA display mode for preview */ SEQ_ALL_WAVEFORMS = (1 << 7), /* draw all waveforms */ SEQ_NO_WAVEFORMS = (1 << 8), /* draw no waveforms */ @@ -1122,8 +1120,6 @@ typedef enum eSpaceImage_Flag { SI_SHOW_R = (1 << 27), SI_SHOW_G = (1 << 28), SI_SHOW_B = (1 << 29), - - SI_NO_DRAWEDGES = (1 << 30), } eSpaceImage_Flag; /* SpaceImage.other_uv_filter */ |