diff options
author | Luca Rood <dev@lucarood.com> | 2017-04-21 15:28:23 +0300 |
---|---|---|
committer | Luca Rood <dev@lucarood.com> | 2017-04-24 17:09:04 +0300 |
commit | 913e9350a56dc384d76a4b1cce36300764c35011 (patch) | |
tree | d9639d9f1334314f2f50e3a3747f841a06a3b093 /source/blender/editors/animation | |
parent | 2010dbe8a59e80775219fb5162f3c2f5dfd24e04 (diff) |
Convert BaseLegacy to Base (part)
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r-- | source/blender/editors/animation/anim_markers.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index e78752a557c..9273ae11906 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -43,6 +43,7 @@ #include "BKE_context.h" #include "BKE_fcurve.h" +#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_report.h" #include "BKE_scene.h" @@ -1135,7 +1136,8 @@ static int ed_marker_select(bContext *C, const wmEvent *event, bool extend, bool if (camera) { Scene *scene = CTX_data_scene(C); - BaseLegacy *base; + SceneLayer *sl = CTX_data_scene_layer(C); + Base *base; TimeMarker *marker; int sel = 0; @@ -1152,11 +1154,11 @@ static int ed_marker_select(bContext *C, const wmEvent *event, bool extend, bool for (marker = markers->first; marker; marker = marker->next) { if (marker->camera) { if (marker->frame == cfra) { - base = BKE_scene_base_find(scene, marker->camera); + base = BKE_scene_layer_base_find(sl, marker->camera); if (base) { - ED_base_object_select(base, sel); + ED_object_base_select(base, sel); if (sel) - ED_base_object_activate(C, base); + ED_object_base_activate(C, base); } } } |