archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Dopesheet: fix crash when dragging keyframes

Browse Source
This commit is contained in:
Dalai Felinto
2017-03-01 10:43:04 +01:00
parent 0b0347dcca
commit 6ee70312bb
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/animation/anim_filter.c
View File

@@ -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;

1
source/blender/editors/transform/transform_generics.c
View File

@@ -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;