diff options
author | Joshua Leung <aligorith@gmail.com> | 2008-12-23 14:42:14 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2008-12-23 14:42:14 +0300 |
commit | 67888ee34b61130113e6b8fc439ff6b50d4078a1 (patch) | |
tree | 515a67df73ad3d0fca7e9b10a7dac30ef5ed56e6 | |
parent | 87c05f7836e5b646e0053bd23f138bc36ab18773 (diff) |
2.5 Action Editor Bugfix - Select keys now works
It is now possible to select individual keyframes again in the Action Editor.
* Temporarily disabled markers keymap in Action Editor, as it was stealing all the events. Waiting for solution from Ton...
* Fixed a crash and wrong coordinate conversion errors
-rw-r--r-- | source/blender/editors/animation/anim_filter.c | 1 | ||||
-rw-r--r-- | source/blender/editors/animation/keyframes_draw.c | 4 | ||||
-rw-r--r-- | source/blender/editors/screen/area.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_action/action_select.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_action/space_action.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index d1f41047475..d21340782e6 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -222,6 +222,7 @@ short ANIM_animdata_get_context (const bContext *C, bAnimContext *ac) ac->scene= scene; ac->obact= (scene && scene->basact)? scene->basact->object : NULL; ac->sa= sa; + ac->ar= ar; ac->spacetype= sa->spacetype; ac->regiontype= ar->regiontype; diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index b72b2bd27fa..449bf001e8f 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -656,9 +656,9 @@ void action_nlascaled_to_keylist(Object *ob, bAction *act, ListBase *keys, ListB * - scaling correction only does times for center-points, so should be faster */ if (achan->ipo) { - //actstrip_map_ipo_keys(ob, achan->ipo, 0, 1); // XXX + ANIM_nla_mapping_apply(ob, achan->ipo, 0, 1); ipo_to_keylist(achan->ipo, keys, blocks, aki); - //actstrip_map_ipo_keys(ob, achan->ipo, 1, 1); // XXX + ANIM_nla_mapping_apply(ob, achan->ipo, 1, 1); } /* then, add keys from constraint channels diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 41212de118a..b50af152922 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -456,6 +456,7 @@ static void ed_default_handlers(wmWindowManager *wm, ListBase *handlers, int fla if(flag & ED_KEYMAP_MARKERS) { ListBase *keymap= WM_keymap_listbase(wm, "Markers", 0, 0); WM_event_add_keymap_handler(handlers, keymap); + // XXX need boundbox check urgently!!! } if(flag & ED_KEYMAP_ANIMATION) { ListBase *keymap= WM_keymap_listbase(wm, "Animation", 0, 0); diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 050674ee32d..fac55963a7f 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -181,7 +181,7 @@ static void *get_nearest_action_key (bAnimContext *ac, int mval[2], float *selx, *par= NULL; UI_view2d_region_to_view(v2d, mval[0], mval[1], &x, &y); - clickmin = (int) (((ACHANNEL_HEIGHT_HALF) - y) / (ACHANNEL_STEP)); // xxx max y-co (first) is -ACHANNEL_HEIGHT + clickmin = (int) ((-y) / (ACHANNEL_STEP)); clickmax = clickmin; /* x-range to check is +/- 7 on either side of mouse click (size of keyframe icon) */ diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index 2d600bfe747..7c56af53397 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -316,7 +316,7 @@ void ED_spacetype_action(void) art->init= action_main_area_init; art->draw= action_main_area_draw; art->listener= action_main_area_listener; - art->keymapflag= ED_KEYMAP_VIEW2D|ED_KEYMAP_MARKERS|ED_KEYMAP_ANIMATION; + art->keymapflag= ED_KEYMAP_VIEW2D/*|ED_KEYMAP_MARKERS*/|ED_KEYMAP_ANIMATION; BLI_addhead(&st->regiontypes, art); |