diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-05-09 05:38:29 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-05-09 05:38:29 +0400 |
| commit | 31471f644cb9d9c3b88da1977705724649482a82 (patch) | |
| tree | 46b5c62b475108e1b1a501a21e53846531ead116 /source/blender/editors/screen/screen_ops.c | |
| parent | b1db37dd056d1b2a16e82f1374163de566c2fe10 (diff) | |
| parent | f8f4f73cc5e6dfdc2a4f8864a3e1edc2639e6fb2 (diff) | |
Merged changes in the trunk up to revision 36551.
Conflicts resolved:
source/creator/SConscript
Diffstat (limited to 'source/blender/editors/screen/screen_ops.c')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index b5f980ab7cb..e2d7147d21f 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1795,20 +1795,22 @@ static int keyframe_jump_exec(bContext *C, wmOperator *op) bDopeSheet ads= {NULL}; DLRBT_Tree keys; ActKeyColumn *ak; - float cfra= (scene)? (float)(CFRA) : 0.0f; + float cfra; short next= RNA_boolean_get(op->ptr, "next"); short done = 0; /* sanity checks */ if (scene == NULL) return OPERATOR_CANCELLED; - + + cfra= (float)(CFRA); + /* init binarytree-list for getting keyframes */ BLI_dlrbTree_init(&keys); /* populate tree with keyframe nodes */ - if (scene) - scene_to_keylist(&ads, scene, &keys, NULL); + scene_to_keylist(&ads, scene, &keys, NULL); + if (ob) ob_to_keylist(&ads, ob, &keys, NULL); @@ -1844,7 +1846,7 @@ static int keyframe_jump_exec(bContext *C, wmOperator *op) sound_seek_scene(C); - WM_event_add_notifier(C, NC_SCENE|ND_FRAME, CTX_data_scene(C)); + WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene); return OPERATOR_FINISHED; } |