Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2014-04-25 19:36:34 +0400
committerJoshua Leung <aligorith@gmail.com>2014-04-27 13:59:17 +0400
commitc26105278fd770241763e04645dfcf5097e1c5d4 (patch)
tree9e4c985077bc604e4f2b7ab3ae3f678abab39b5c /source/blender/editors/space_time
parentb6e967be636d0e1bae842b2c52c76fd867a4784a (diff)
Fix T34993: "Jump to Next Keyframe" shortcut not related to the timeline viewable keyframes
Made the timeline option to only show keyframes from selected channels/data be a per-scene setting instead of the per-timeline option it was previously. This makes it easier for animators working on rigs with multiple bones (especially during the polishing phase), since now the timeline and jump to keyframe operators use the same setting to decide which subset of keyframes they need to consider. By default, this option is enabled by default. TODO: Extend this to the keyframe status shading on the active object name in the 3D view?
Diffstat (limited to 'source/blender/editors/space_time')
-rw-r--r--source/blender/editors/space_time/space_time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index 51d9840a079..04c1225afb6 100644
--- a/source/blender/editors/space_time/space_time.c
+++ b/source/blender/editors/space_time/space_time.c
@@ -341,7 +341,7 @@ static void time_draw_keyframes(const bContext *C, SpaceTime *stime, ARegion *ar
Scene *scene = CTX_data_scene(C);
Object *ob = CTX_data_active_object(C);
View2D *v2d = &ar->v2d;
- short onlysel = (stime->flag & TIME_ONLYACTSEL);
+ bool onlysel = ((scene->flag & SCE_KEYS_NO_SELONLY) == 0);
/* draw scene keyframes first
* - don't try to do this when only drawing active/selected data keyframes,