First merge with 2.5 branch.

[blender-staging.git] / source / blender / editors / animation / anim_filter.c

diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index b177a19a07f56741300014901ae5b58d5935664a..93bdadc27d388186f083650960548dbe15e23598 100644 (file)
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -291,12 +291,7 @@ short ANIM_animdata_get_context (const bContext *C, bAnimContext *ac)
        
        /* get useful default context settings from context */
        ac->scene= scene;
-       if (scene) {
-               ac->markers.first= scene->markers.first;
-               ac->markers.last= scene->markers.last;
-               
-               ac->obact= (scene->basact)?  scene->basact->object : NULL;
-       }
+       ac->obact= (scene && scene->basact)?  scene->basact->object : NULL;
        ac->sa= sa;
        ac->ar= ar;
        ac->spacetype= (sa) ? sa->spacetype : 0;