diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-03-18 09:06:54 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-03-18 09:06:54 +0300 |
| commit | 5a9082a193d4dd741454e574bbc844e99cbb2d65 (patch) | |
| tree | dce37e6307b07f2a15cec85af1e02d219bf6ee33 /source/blender/include | |
| parent | 90eb851d50508913dd34e7a7376309b7d4b98383 (diff) | |
== Action Editor ==
* When the mouse is over an Action or Constraint Channel, you can now
rename it by pressing NKEY (like for Shapekey channels). You can also set
the 'protection' status for the Action/Constraint channel in this way.
* Removed the double confirmation when deleting Action-Channels. Also,
markers are now not deleted when deleting action channels.
Diffstat (limited to 'source/blender/include')
| -rw-r--r-- | source/blender/include/BIF_editaction.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/source/blender/include/BIF_editaction.h b/source/blender/include/BIF_editaction.h index 5705b4d83ed..2419cc779dd 100644 --- a/source/blender/include/BIF_editaction.h +++ b/source/blender/include/BIF_editaction.h @@ -50,10 +50,20 @@ #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 + +/* Macros for easier/more consistant state testing */ #define VISIBLE_ACHAN(achan) ((achan->flag & ACHAN_HIDDEN)==0) -#define EDITABLE_ACHAN(achan) (((achan->flag & ACHAN_HIDDEN)==0) && ((achan->flag & ACHAN_PROTECTED)==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 EDITABLE_CONCHAN(conchan) ((conchan->flag & CONSTRAINT_CHANNEL_PROTECTED)==0) + #define CHANNEL_FILTER_LOC 0x00000001 /* Show location keys */ #define CHANNEL_FILTER_ROT 0x00000002 /* Show rotation keys */ #define CHANNEL_FILTER_SIZE 0x00000004 /* Show size keys */ @@ -81,8 +91,6 @@ void duplicate_meshchannel_keys(struct Key *key); void duplicate_actionchannel_keys(void); void transform_actionchannel_keys(int mode, int dummy); void transform_meshchannel_keys(char mode, struct Key *key); -struct Key *get_action_mesh_key(void); -int get_nearest_key_num(struct Key *key, short *mval, float *x); void snap_keys_to_frame(int snap_mode); void mirror_action_keys(short mirror_mode); void clean_shapekeys(struct Key *key); @@ -117,6 +125,11 @@ void deselect_meshchannel_keys (struct Key *key, int test, int sel); int select_channel(struct bAction *act, struct bActionChannel *chan, int selectmode); void select_actionchannel_by_name (struct bAction *act, char *name, int select); +/* */ +struct Key *get_action_mesh_key(void); +int get_nearest_key_num(struct Key *key, short *mval, float *x); +void *get_nearest_act_channel(short mval[], short *ret_type); + /* Action */ struct bActionChannel* get_hilighted_action_channel(struct bAction* action); struct bAction *add_empty_action(char *name); |