Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2009-07-09 17:14:51 +0400
committerJoshua Leung <aligorith@gmail.com>2009-07-09 17:14:51 +0400
commitc1f3b86f861028c9f1b6e8eedc5d4c07b77205a7 (patch)
treefe2c72072a8d198323daf63b3605449dd4f4d763 /source/blender/editors/space_nla/nla_draw.c
parentf9749ea2e778165cf6e92cc263f5be3a802247fa (diff)
NLA SoC: Cleanup of Keyframe Drawing code for DopeSheet
* Removed the glaMapping stuff in favour of remapping the keyframes manually. The old code was causing some mess, and not really working well for the DopeSheet with various mappings being used. * Fixed NLA-mapped selection in DopeSheet. Clicking on individual keyframes should now work ok. More testing required though. * Keyframes in DopeSheet are now drawn fully using OpenGL (instead of icons). They look less tactile now, but this may be compensated with in terms of speed? Previously I disabled this type of drawing due to issues with some cards. Enabled again for now, but mainly because I couldn't get the icons to line up nicely in screenspace... * Borderselect in DopeSheet. I've had a look at issues with it selecting the wrong channel's keyframes. The issues don't seem to be solved yet though... will look again tomorrow.
Diffstat (limited to 'source/blender/editors/space_nla/nla_draw.c')
-rw-r--r--source/blender/editors/space_nla/nla_draw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index 7b2b19c19f6..3385906979a 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -143,7 +143,7 @@ static void nla_action_draw_keyframes (AnimData *adt, View2D *v2d, float y)
glColor3f(0.0f, 0.0f, 0.0f);
/* get a list of the keyframes with NLA-scaling applied */
- action_nlascaled_to_keylist(adt, adt->action, &keys, NULL, NULL);
+ action_to_keylist(adt, adt->action, &keys, NULL);
/* get View2D scaling factor */
UI_view2d_getscale(v2d, &xscale, NULL);