diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-24 16:13:13 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-24 16:13:13 +0400 |
| commit | 385c72f5f26ae9c86bf40c127c44216ceea0e6c1 (patch) | |
| tree | 6c0432578abee5437adc94e96b5a91c593b866b4 /source/blender/editors/space_graph/graph_intern.h | |
| parent | 5841d1c8145ba50addeb17fa0231705d949d8b3d (diff) | |
| parent | b5ce1b1a23a3befbcc4cd3c67a5ec6a76d77aa5a (diff) | |
Merged changes in the trunk up to revision 55546.
Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript
Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.
Diffstat (limited to 'source/blender/editors/space_graph/graph_intern.h')
| -rw-r--r-- | source/blender/editors/space_graph/graph_intern.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_graph/graph_intern.h b/source/blender/editors/space_graph/graph_intern.h index b2dbf764c1d..8dc5e9a441d 100644 --- a/source/blender/editors/space_graph/graph_intern.h +++ b/source/blender/editors/space_graph/graph_intern.h @@ -69,19 +69,19 @@ void GRAPH_OT_select_leftright(struct wmOperatorType *ot); void GRAPH_OT_clickselect(struct wmOperatorType *ot); /* defines for left-right select tool */ -enum { +enum eGraphKeys_LeftRightSelect_Mode { GRAPHKEYS_LRSEL_TEST = 0, GRAPHKEYS_LRSEL_LEFT, GRAPHKEYS_LRSEL_RIGHT -} eGraphKeys_LeftRightSelect_Mode; +}; /* defines for column-select mode */ -enum { +enum eGraphKeys_ColumnSelect_Mode { GRAPHKEYS_COLUMNSEL_KEYS = 0, GRAPHKEYS_COLUMNSEL_CFRA, GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN, GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN, -} eGraphKeys_ColumnSelect_Mode; +}; /* ***************************************** */ /* graph_edit.c */ @@ -119,25 +119,25 @@ void GRAPH_OT_mirror(struct wmOperatorType *ot); /* defines for snap keyframes * NOTE: keep in sync with eEditKeyframes_Snap (in ED_keyframes_edit.h) */ -enum { +enum eGraphKeys_Snap_Mode { GRAPHKEYS_SNAP_CFRA = 1, GRAPHKEYS_SNAP_NEAREST_FRAME, GRAPHKEYS_SNAP_NEAREST_SECOND, GRAPHKEYS_SNAP_NEAREST_MARKER, GRAPHKEYS_SNAP_HORIZONTAL, GRAPHKEYS_SNAP_VALUE, -} eGraphKeys_Snap_Mode; +}; /* defines for mirror keyframes * NOTE: keep in sync with eEditKeyframes_Mirror (in ED_keyframes_edit.h) */ -enum { +enum eGraphKeys_Mirror_Mode { GRAPHKEYS_MIRROR_CFRA = 1, GRAPHKEYS_MIRROR_YAXIS, GRAPHKEYS_MIRROR_XAXIS, GRAPHKEYS_MIRROR_MARKER, GRAPHKEYS_MIRROR_VALUE, -} eGraphKeys_Mirror_Mode; +}; /* ----------- */ |