diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-04-13 15:15:08 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-04-13 15:15:08 +0400 |
| commit | 99e4e1fcb793abbd2563311dd9682bcd02e6e375 (patch) | |
| tree | abed0f9662d1c61a48c4fe755d579ed800ce64f3 /source/blender/include/BIF_editaction.h | |
| parent | 54efb4c916f10a8dc8291aa33135385cef5cdd25 (diff) | |
== Action Editor - Individual IPO-Curves Now Shown ==
Continuing on from my previous 'Expandable/Collapsable Action Channel' commit, this commit introduces the ability to show/hide the keyframes in each ipo-curve represented by an Action Channel.
When you expand an Action-Channel by clicking on the triangle beside its name, you will now be presented with options to show/hide the ipo-curves represented by
the Action-Channel, and/or the Constraint Channels belonging to that Action-Channel. Actual ipo-curves will not be drawn in the Action-Editor, but the keyframes
will be shown.
Screenshot:
* http://wiki.blender.org/index.php/Image:244_ActionEditor_SubTracks_01.png
Possibly Coming Soon/Further Work:
* 'Protection' options for ipo-curves (currently disabled in code, as all IPO-related
tools will need to be made aware of this)
* Sliders for IPO-Curve Channels of the active Action-Channel
Diffstat (limited to 'source/blender/include/BIF_editaction.h')
| -rw-r--r-- | source/blender/include/BIF_editaction.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/source/blender/include/BIF_editaction.h b/source/blender/include/BIF_editaction.h index 974ffc412d4..2d92b120b9a 100644 --- a/source/blender/include/BIF_editaction.h +++ b/source/blender/include/BIF_editaction.h @@ -46,34 +46,31 @@ #define CHANNELHEIGHT 16 #define CHANNELSKIP 2 -#define NAMEWIDTH 144 +#define NAMEWIDTH 164 #define SLIDERWIDTH 125 #define ACTWIDTH (G.saction->actwidth) /* Some types for easier type-testing */ -#define ACTTYPE_NONE 0 -#define ACTTYPE_ACHAN 1 -#define ACTTYPE_CONCHAN 2 +#define ACTTYPE_NONE 0 +#define ACTTYPE_ACHAN 1 +#define ACTTYPE_CONCHAN 2 +#define ACTTYPE_ICU 3 +#define ACTTYPE_FILLIPO 4 +#define ACTTYPE_FILLCON 5 /* Macros for easier/more consistant state testing */ #define VISIBLE_ACHAN(achan) ((achan->flag & ACHAN_HIDDEN)==0) #define EDITABLE_ACHAN(achan) ((VISIBLE_ACHAN(achan)) && ((achan->flag & ACHAN_PROTECTED)==0)) #define EXPANDED_ACHAN(achan) ((VISIBLE_ACHAN(achan)) && (achan->flag & ACHAN_EXPANDED)) #define SEL_ACHAN(achan) ((achan->flag & ACHAN_SELECTED) || (achan->flag & ACHAN_HILIGHTED)) +#define FILTER_IPO_ACHAN(achan) ((achan->flag & ACHAN_SHOWIPO)) +#define FILTER_CON_ACHAN(achan) ((achan->flag & ACHAN_SHOWCONS)) #define EDITABLE_CONCHAN(conchan) ((conchan->flag & CONSTRAINT_CHANNEL_PROTECTED)==0) #define SEL_CONCHAN(conchan) (conchan->flag & CONSTRAINT_CHANNEL_SELECT) -#define CHANNEL_FILTER_LOC 0x00000001 /* Show location keys */ -#define CHANNEL_FILTER_ROT 0x00000002 /* Show rotation keys */ -#define CHANNEL_FILTER_SIZE 0x00000004 /* Show size keys */ -#define CHANNEL_FILTER_CON 0x00000008 /* Show constraint keys */ -#define CHANNEL_FILTER_RGB 0x00000010 /* Show object color keys */ - -#define CHANNEL_FILTER_CU 0x00010000 /* Show curve keys */ -#define CHANNEL_FILTER_ME 0x00020000 /* Show mesh keys */ -#define CHANNEL_FILTER_LA 0x00040000 /* Show lamp keys */ - +#define EDITABLE_ICU(icu) ((icu->flag & IPO_PROTECT)==0) +#define SEL_ICU(icu) (icu->flag & IPO_SELECT) struct bAction; struct bActionChannel; |