diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-02-04 11:33:07 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-02-04 11:33:07 +0300 |
| commit | a155d8895d9846a54a084ced1b782594e9f479b2 (patch) | |
| tree | 99b784e8d3aa6c3aa0d910891a86731f5ff6c74e /source/blender/editors/animation | |
| parent | ce5dc02c8c1b4738dd0f7ede35873e4ad6537814 (diff) | |
Moved Auto-Keying "Insert for KeyingSet only" option from UserPrefs to
Scene (Toolsettings, i.e. alongside "layered" option for using NLA
while doing auto-keying)
This option makes all Auto-Keying operations use the active Keying Set
to carry out keyframing operations instead of picking and choosing
their own Keying Sets to use, thus cutting down on the number of
unwanted keys.
Warning: if the older userpref option was enabled in an old
startup.blend, it may be difficult to turn this option off.
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/keyframing.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/animation/keyingsets.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index b779250995e..d535481d154 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -88,15 +88,15 @@ short ANIM_get_keyframing_flags (Scene *scene, short incl_mode) /* standard flags */ { /* visual keying */ - if (IS_AUTOKEY_FLAG(AUTOMATKEY)) + if (IS_AUTOKEY_FLAG(scene, AUTOMATKEY)) flag |= INSERTKEY_MATRIX; /* only needed */ - if (IS_AUTOKEY_FLAG(INSERTNEEDED)) + if (IS_AUTOKEY_FLAG(scene, INSERTNEEDED)) flag |= INSERTKEY_NEEDED; /* default F-Curve color mode - RGB from XYZ indices */ - if (IS_AUTOKEY_FLAG(XYZ2RGB)) + if (IS_AUTOKEY_FLAG(scene, XYZ2RGB)) flag |= INSERTKEY_XYZ2RGB; } diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index 24bd5b3ec5e..2df7d21e907 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -308,7 +308,7 @@ static int add_keyingset_button_exec (bContext *C, wmOperator *op) keyingflag |= ANIM_get_keyframing_flags(scene, 0); - if (IS_AUTOKEY_FLAG(XYZ2RGB)) + if (IS_AUTOKEY_FLAG(scene, XYZ2RGB)) keyingflag |= INSERTKEY_XYZ2RGB; /* call the API func, and set the active keyingset index */ @@ -680,9 +680,9 @@ KeyingSet *ANIM_get_keyingset_for_autokeying(Scene *scene, const char *tranformK * - use the active KeyingSet if defined (and user wants to use it for all autokeying), * or otherwise key transforms only */ - if (IS_AUTOKEY_FLAG(ONLYKEYINGSET) && (scene->active_keyingset)) + if (IS_AUTOKEY_FLAG(scene, ONLYKEYINGSET) && (scene->active_keyingset)) return ANIM_scene_get_active_keyingset(scene); - else if (IS_AUTOKEY_FLAG(INSERTAVAIL)) + else if (IS_AUTOKEY_FLAG(scene, INSERTAVAIL)) return ANIM_builtin_keyingset_get_named(NULL, "Available"); else return ANIM_builtin_keyingset_get_named(NULL, tranformKSName); |