From 7e3d2a8baaca06965ee6a244ef124bc33c92b693 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 14 Feb 2017 16:33:13 +0100 Subject: Sorted BaseLegacy > Base convertions Including bring back UV Edit show other objects --- source/blender/editors/space_time/space_time.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/space_time') diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index 66ce6d6bb8e..986ac062b05 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -346,7 +346,7 @@ static void time_draw_idblock_keyframes(View2D *v2d, ID *id, short onlysel, cons BLI_dlrbTree_free(&keys); } -static void time_draw_caches_keyframes(Main *bmain, Scene *scene, View2D *v2d, bool onlysel, const unsigned char color[3]) +static void time_draw_caches_keyframes(Main *bmain, SceneLayer *sl, View2D *v2d, bool onlysel, const unsigned char color[3]) { CacheFile *cache_file; @@ -357,7 +357,7 @@ static void time_draw_caches_keyframes(Main *bmain, Scene *scene, View2D *v2d, b cache_file->draw_flag &= ~CACHEFILE_KEYFRAME_DRAWN; } - for (BaseLegacy *base = scene->base.first; base; base = base->next) { + for (Base *base = sl->object_bases.first; base; base = base->next) { Object *ob = base->object; ModifierData *md = modifiers_findByType(ob, eModifierType_MeshSequenceCache); @@ -400,6 +400,7 @@ static void time_draw_caches_keyframes(Main *bmain, Scene *scene, View2D *v2d, b static void time_draw_keyframes(const bContext *C, ARegion *ar) { Scene *scene = CTX_data_scene(C); + SceneLayer *sl = CTX_data_scene_layer(C); Object *ob = CTX_data_active_object(C); View2D *v2d = &ar->v2d; bool onlysel = ((scene->flag & SCE_KEYS_NO_SELONLY) == 0); @@ -410,7 +411,7 @@ static void time_draw_keyframes(const bContext *C, ARegion *ar) /* draw cache files keyframes (if available) */ UI_GetThemeColor3ubv(TH_TIME_KEYFRAME, color); - time_draw_caches_keyframes(CTX_data_main(C), scene, v2d, onlysel, color); + time_draw_caches_keyframes(CTX_data_main(C), sl, v2d, onlysel, color); /* draw grease pencil keyframes (if available) */ UI_GetThemeColor3ubv(TH_TIME_GP_KEYFRAME, color); -- cgit v1.2.3