Animato - Bugfixes + Nicer names in Action Editor

* Action Editor/Dopesheet now displays names retrieved from RNA in the form - "<Struct/OwnerName>.<PropertyName>.<ArrayIndex>"
i.e. "HeadBone.Location.X"
i.e. "Cube.Rotation.Y"
i.e. "Material.Diffuse Color.G"

For now, the first part of the name may be unclear as it is easy to confuse Material channels with Object ones if the material was called "Object1" or so (theoretrical example only). This will be explored further.

* Also, fixed crashes when loading some old files with 'Object' Action Channels in their Actions

1 files changed, 5 insertions, 4 deletions

diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c
index b4430e51a06..de7453654ff 100644
--- a/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@ -439,7 +439,7 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 			bActionGroup *grp = NULL;
 			short indent= 0, offset= 0, sel= 0, group= 0;
 			int expand= -1, protect = -1, special= -1, mute = -1;
-			char name[64];
+			char name[128];
 			
 			/* determine what needs to be drawn */
 			switch (ale->type) {
@@ -618,16 +618,16 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 					FCurve *fcu = (FCurve *)ale->data;
 					
 					indent = 0;
-					protect = -1; // for now, until this can be supported by others
 					
 					//group= (ale->grp) ? 1 : 0;
 					//grp= ale->grp;
 					
+					// XXX this needs to be more detailed...
 					if (ale->id) {
 						if (GS(ale->id->name) == ID_MA)
 							offset= 21;
 						else
-							offset= 0;
+							offset= 14;
 					}
 					else
 						offset= 0;
@@ -645,7 +645,8 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 					sel = SEL_FCU(fcu);
 					
 					// for now, we just print the full path... this needs more work!
-					sprintf(name, "%s[%d]", fcu->rna_path, fcu->array_index);
+					getname_anim_fcurve(name, ale->id, fcu);
+					//sprintf(name, "%s[%d]", fcu->rna_path, fcu->array_index);
 				}
 					break;