diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-01-12 14:06:51 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-01-12 14:06:51 +0300 |
| commit | 4830f12680b963d6d95fe0bd5ed4d3d9acb6eeb6 (patch) | |
| tree | 7c2ff90653a8a948e0ec2938e7a65ca9aff28921 /source/blender/makesdna/DNA_userdef_types.h | |
| parent | 60722bfb1d1a1dc1d76fa602f95892756ab65680 (diff) | |
== AutoKeying - Tidy Up ==
This commit restores the "big red button". When Auto-Keying is enabled (record button toggled on), a menu appears beside it to choose which behaviour for auto-keying should be used. This should be more efficient for quickly turning Auto-Keying on/off.
I've also added the relevant version-patches to fix up old files so that sensible default options are in use.
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index cbbd729cb83..68692b82ba5 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -262,9 +262,11 @@ extern UserDef U; /* from usiblender.c !!!! */ #define USER_SHOW_FPS (1 << 21) /* Auto-Keying mode */ -#define AUTOKEY_MODE_OFF 0 -#define AUTOKEY_MODE_NORMAL 1 -#define AUTOKEY_MODE_EDITKEYS 2 + /* AUTOKEY_ON is a bitflag */ +#define AUTOKEY_ON 1 + /* AUTOKEY_ON + 2**n... (i.e. AUTOKEY_MODE_NORMAL = AUTOKEY_ON + 2) to preserve setting, even when autokey turned off */ +#define AUTOKEY_MODE_NORMAL 3 +#define AUTOKEY_MODE_EDITKEYS 5 /* Auto-Keying flag */ #define AUTOKEY_FLAG_INSERTAVAIL (1<<0) @@ -272,6 +274,7 @@ extern UserDef U; /* from usiblender.c !!!! */ #define AUTOKEY_FLAG_AUTOMATKEY (1<<2) /* Auto-Keying macros */ +#define IS_AUTOKEY_ON (U.autokey_mode & AUTOKEY_ON) #define IS_AUTOKEY_MODE(mode) (U.autokey_mode == AUTOKEY_MODE_##mode) #define IS_AUTOKEY_FLAG(flag) (U.autokey_flag == AUTOKEY_FLAG_##flag) |