diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-03-01 12:43:04 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-03-01 12:43:04 +0300 |
commit | 6ee70312bbd1a089336e7e0716642c3b145a49c2 (patch) | |
tree | 98a601ec172a5f725f690c59c57daf023e830d5b /source/blender | |
parent | 0b0347dcca07298a7d72772c23e7503c0505016f (diff) |
Dopesheet: fix crash when dragging keyframes
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 201f3a49a3d..593b674858f 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -380,9 +380,9 @@ bool ANIM_animdata_get_context(const bContext *C, bAnimContext *ac) ac->scene = scene; if (scene) { ac->markers = ED_context_get_markers(C); - ac->obact = (scene->basact) ? scene->basact->object : NULL; } ac->scene_layer = CTX_data_scene_layer(C); + ac->obact = (ac->scene_layer->basact) ? ac->scene_layer->basact->object : NULL; ac->sa = sa; ac->ar = ar; ac->sl = sl; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 012342c16fc..343cae39db2 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -325,6 +325,7 @@ static void recalcData_actedit(TransInfo *t) /* initialize relevant anim-context 'context' data from TransInfo data */ /* NOTE: sync this with the code in ANIM_animdata_get_context() */ ac.scene = t->scene; + ac.scene_layer = t->sl; ac.obact = OBACT_NEW; ac.sa = t->sa; ac.ar = t->ar; |