From 4263c13c392fadea67f7b4884fb6af50585a6c69 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Mon, 13 Apr 2009 11:15:43 +0000 Subject: Animato Bugfixes: * Copying objects with animation data now works correctly. Previously, actions were not getting copied correctly, leading to loss of data in some cases. * Action and Graph editors now display the name of the Action concerned (for 'Action' folder channels), making it easier to tell which AnimData blocks are sharing the same actions * Added some code to make relative KeyingSets (converted from absolute ones) work better. --- source/blender/editors/armature/poselib.c | 3 +-- source/blender/editors/space_action/action_draw.c | 2 +- source/blender/editors/space_graph/graph_draw.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index 8e6f118118a..f27bec81d7a 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -193,8 +193,7 @@ bAction *poselib_init_new (Object *ob) /* init object's poselib action (unlink old one if there) */ if (ob->poselib) ob->poselib->id.us--; - // XXX old anim stuff - // ob->poselib= add_empty_action("PoseLib"); + ob->poselib= add_empty_action("PoseLib"); return ob->poselib; } diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c index 669320e72bf..4eb26303b13 100644 --- a/source/blender/editors/space_action/action_draw.c +++ b/source/blender/editors/space_action/action_draw.c @@ -499,7 +499,7 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar) expand= ICON_TRIA_RIGHT; sel = SEL_ACTC(act); - strcpy(name, "Action"); + strcpy(name, act->id.name+2); } break; case ANIMTYPE_FILLMATD: /* object materials (dopesheet) expand widget */ diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c index 97c9995eab6..e8c84b1d74d 100644 --- a/source/blender/editors/space_graph/graph_draw.c +++ b/source/blender/editors/space_graph/graph_draw.c @@ -1007,7 +1007,7 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar) expand= ICON_TRIA_RIGHT; sel = SEL_ACTC(act); - strcpy(name, "Action"); + strcpy(name, act->id.name+2); } break; case ANIMTYPE_FILLDRIVERS: /* drivers widget */ -- cgit v1.2.3