[Bf-blender-cvs] [6ee70312bb] blender2.8: Dopesheet: fix crash when dragging keyframes

[Dalai Felinto]

Commit: 6ee70312bbd1a089336e7e0716642c3b145a49c2
Author: Dalai Felinto
Date:   Wed Mar 1 10:43:04 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB6ee70312bbd1a089336e7e0716642c3b145a49c2

Dopesheet: fix crash when dragging keyframes

===================================================================

M	source/blender/editors/animation/anim_filter.c
M	source/blender/editors/transform/transform_generics.c

===================================================================

diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index 201f3a49a3..593b674858 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 012342c16f..343cae39db 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;