diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 00:39:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 00:39:39 +0400 |
| commit | 9892736206676c5b7fabc8d1184f9655511ff2dd (patch) | |
| tree | 83562ac50c93fe3004959d35c1af4a5b380fdd97 /source/blender/editors/include/ED_screen_types.h | |
| parent | cffaa42d3a34c6b310c3c87c98e1f8313881e473 (diff) | |
code cleanup: header cleanup and remove some duplicate defines.
Diffstat (limited to 'source/blender/editors/include/ED_screen_types.h')
| -rw-r--r-- | source/blender/editors/include/ED_screen_types.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.h index 6f7d0c55b9a..c53dca47da9 100644 --- a/source/blender/editors/include/ED_screen_types.h +++ b/source/blender/editors/include/ED_screen_types.h @@ -35,27 +35,27 @@ /* for animplayer */ typedef struct ScreenAnimData { - ARegion *ar; /* do not read from this, only for comparing if region exists */ + ARegion *ar; /* do not read from this, only for comparing if region exists */ short redraws; short refresh; - short flag; /* flags for playback */ - int sfra; /* frame that playback was started from */ - int nextfra; /* next frame to go to (when ANIMPLAY_FLAG_USE_NEXT_FRAME is set) */ - double last_duration; /* used for frame dropping */ + short flag; /* flags for playback */ + int sfra; /* frame that playback was started from */ + int nextfra; /* next frame to go to (when ANIMPLAY_FLAG_USE_NEXT_FRAME is set) */ + double last_duration; /* used for frame dropping */ } ScreenAnimData; /* for animplayer */ enum { - /* user-setting - frame range is played backwards */ - ANIMPLAY_FLAG_REVERSE = (1<<0), - /* temporary - playback just jumped to the start/end */ - ANIMPLAY_FLAG_JUMPED = (1<<1), - /* drop frames as needed to maintain framerate */ - ANIMPLAY_FLAG_SYNC = (1<<2), - /* don't drop frames (and ignore SCE_FRAME_DROP flag) */ - ANIMPLAY_FLAG_NO_SYNC = (1<<3), - /* use nextfra at next timer update */ - ANIMPLAY_FLAG_USE_NEXT_FRAME = (1<<4) + /* user-setting - frame range is played backwards */ + ANIMPLAY_FLAG_REVERSE = (1 << 0), + /* temporary - playback just jumped to the start/end */ + ANIMPLAY_FLAG_JUMPED = (1 << 1), + /* drop frames as needed to maintain framerate */ + ANIMPLAY_FLAG_SYNC = (1 << 2), + /* don't drop frames (and ignore SCE_FRAME_DROP flag) */ + ANIMPLAY_FLAG_NO_SYNC = (1 << 3), + /* use nextfra at next timer update */ + ANIMPLAY_FLAG_USE_NEXT_FRAME = (1 << 4) }; /* ----------------------------------------------------- */ @@ -76,10 +76,10 @@ typedef struct ScreenFrameRateInfo { /* Enum for Action Zone Edges. Which edge of area is action zone. */ typedef enum { - AE_RIGHT_TO_TOPLEFT, /* Region located on the left, _right_ edge is action zone. Region minimised to the top left */ - AE_LEFT_TO_TOPRIGHT, /* Region located on the right, _left_ edge is action zone. Region minimised to the top right */ - AE_TOP_TO_BOTTOMRIGHT, /* Region located at the bottom, _top_ edge is action zone. Region minimised to the bottom right */ - AE_BOTTOM_TO_TOPLEFT /* Region located at the top, _bottom_edge is action zone. Region minimised to the top left */ + AE_RIGHT_TO_TOPLEFT, /* Region located on the left, _right_ edge is action zone. Region minimised to the top left */ + AE_LEFT_TO_TOPRIGHT, /* Region located on the right, _left_ edge is action zone. Region minimised to the top right */ + AE_TOP_TO_BOTTOMRIGHT, /* Region located at the bottom, _top_ edge is action zone. Region minimised to the bottom right */ + AE_BOTTOM_TO_TOPLEFT /* Region located at the top, _bottom_edge is action zone. Region minimised to the top left */ } AZEdge; /* for editing areas/regions */ @@ -98,7 +98,7 @@ typedef struct AZone { } AZone; /* actionzone type */ -#define AZONE_AREA 1 -#define AZONE_REGION 2 +#define AZONE_AREA 1 +#define AZONE_REGION 2 #endif /* __ED_SCREEN_TYPES_H__ */ |