Revision: 18026
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18026
Author: aligorith
Date: 2008-12-23 12:42:14 +0100 (Tue, 23 Dec 2008)
Log Message:
-----------
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
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c
branches/blender2.5/blender/source/blender/editors/animation/keyframes_draw.c
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
branches/blender2.5/blender/source/blender/editors/space_action/space_action.c
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c
2008-12-23 11:02:39 UTC (rev 18025)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c
2008-12-23 11:42:14 UTC (rev 18026)
@@ -222,6 +222,7 @@
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;
Modified:
branches/blender2.5/blender/source/blender/editors/animation/keyframes_draw.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/animation/keyframes_draw.c
2008-12-23 11:02:39 UTC (rev 18025)
+++
branches/blender2.5/blender/source/blender/editors/animation/keyframes_draw.c
2008-12-23 11:42:14 UTC (rev 18026)
@@ -656,9 +656,9 @@
* - 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
Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c
2008-12-23 11:02:39 UTC (rev 18025)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c
2008-12-23 11:42:14 UTC (rev 18026)
@@ -456,6 +456,7 @@
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);
Modified:
branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
2008-12-23 11:02:39 UTC (rev 18025)
+++
branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
2008-12-23 11:42:14 UTC (rev 18026)
@@ -181,7 +181,7 @@
*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) */
Modified:
branches/blender2.5/blender/source/blender/editors/space_action/space_action.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_action/space_action.c
2008-12-23 11:02:39 UTC (rev 18025)
+++
branches/blender2.5/blender/source/blender/editors/space_action/space_action.c
2008-12-23 11:42:14 UTC (rev 18026)
@@ -316,7 +316,7 @@
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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
