Action Editor:

* Grease Pencil Mode - now includes the area-ID into the name string. While the numbers currently don't mean much (though they do make it easier to distinguish between views to more than before), they could become handy if/when PyAPI access to Grease Pencil data comes into handy

* Copy + Paste bugfixes
- When there was a collapsed group, it was impossible to get the keyframes in the keyframe summary to be copied too. This fix shouldn't cause any problems with other things...
- Feature to allow pasting to any channel without doing name matching was not working

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c
index 64e85bfcd4e..0d2c8dce43d 100644
--- a/source/blender/src/drawaction.c
+++ b/source/blender/src/drawaction.c
@@ -647,7 +647,7 @@ static void draw_channel_names(void)
 						case SPACE_VIEW3D:
 						{
 							/* this shouldn't cause any overflow... */
-							sprintf(name, "3DView: %s", view3d_get_name(sa->spacedata.first));
+							sprintf(name, "3DView[%02d]:%s", sa->win, view3d_get_name(sa->spacedata.first));
 							special= ICON_VIEW3D;
 						}
 							break;
@@ -660,7 +660,7 @@ static void draw_channel_names(void)
 								sprintf(treetype, "Composite");
 							else
 								sprintf(treetype, "Material");
-							sprintf(name, "Nodes: %s", treetype);
+							sprintf(name, "Nodes[%02d]:%s", sa->win, treetype);
 							
 							special= ICON_NODE;
 						}
@@ -678,7 +678,7 @@ static void draw_channel_names(void)
 								
 								default:	sprintf(imgpreview, "Sequence");	break;
 							}
-							sprintf(name, "Sequencer: %s", imgpreview);
+							sprintf(name, "Sequencer[%02d]:%s", sa->win, imgpreview);
 							
 							special= ICON_SEQUENCE;
 						}
@@ -688,9 +688,9 @@ static void draw_channel_names(void)
 							SpaceImage *sima= sa->spacedata.first;
 							
 							if (sima->image)
-								sprintf(name, "Image: %s", sima->image->id.name+2);
+								sprintf(name, "Image[%02d]:%s", sa->win, sima->image->id.name+2);
 							else
-								sprintf(name, "Image: <None>");
+								sprintf(name, "Image[%02d]:<None>", sa->win);
 								
 							special= ICON_IMAGE_COL;
 						}
@@ -698,7 +698,7 @@ static void draw_channel_names(void)
 						
 						default:
 						{
-							sprintf(name, "<Unknown GP-Data Source>");
+							sprintf(name, "[%02d]<Unknown GP-Data Source>", sa->win);
 							special= -1;
 						}
 							break;