diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-03-03 14:48:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-03-03 14:48:03 +0300 |
commit | 74faed26fcd15244d65f3a0777fbe2d54b5d5bc5 (patch) | |
tree | 52369aabf96cc064822f08a4b819f85c9ce9ceee /source/blender/editors/animation/anim_markers.c | |
parent | 0dfb6c4d0b3b8079744f05297cfbd445f8369f75 (diff) |
marker/camera select, makes active as well as selecting.
Diffstat (limited to 'source/blender/editors/animation/anim_markers.c')
-rw-r--r-- | source/blender/editors/animation/anim_markers.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index a154164983e..3e580ffd7ac 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -817,6 +817,7 @@ static int ed_marker_select(bContext *C, wmEvent *evt, int extend, int camera) if(camera) { Scene *scene= CTX_data_scene(C); + Base *base; TimeMarker *marker; int sel; @@ -833,7 +834,12 @@ static int ed_marker_select(bContext *C, wmEvent *evt, int extend, int camera) for (marker= markers->first; marker; marker= marker->next) { if(marker->camera) { if(marker->frame==cfra) { - ED_base_object_select(object_in_scene(marker->camera, scene), sel); + base= object_in_scene(marker->camera, scene); + if(base) { + ED_base_object_select(base, sel); + if(sel) + ED_base_object_activate(C, base); + } } } } |