Revision: 16847
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16847
Author: aligorith
Date: 2008-09-30 12:54:12 +0200 (Tue, 30 Sep 2008)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/blender/source/blender/src/drawaction.c
trunk/blender/source/blender/src/editaction.c
Modified: trunk/blender/source/blender/src/drawaction.c
===================================================================
--- trunk/blender/source/blender/src/drawaction.c 2008-09-30 10:41:47 UTC
(rev 16846)
+++ trunk/blender/source/blender/src/drawaction.c 2008-09-30 10:54:12 UTC
(rev 16847)
@@ -647,7 +647,7 @@
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 @@
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 @@
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 @@
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 @@
default:
{
- sprintf(name, "<Unknown
GP-Data Source>");
+ sprintf(name,
"[%02d]<Unknown GP-Data Source>", sa->win);
special= -1;
}
break;
Modified: trunk/blender/source/blender/src/editaction.c
===================================================================
--- trunk/blender/source/blender/src/editaction.c 2008-09-30 10:41:47 UTC
(rev 16846)
+++ trunk/blender/source/blender/src/editaction.c 2008-09-30 10:54:12 UTC
(rev 16847)
@@ -436,7 +436,7 @@
*/
if ( (!(filter_mode & ACTFILTER_VISIBLE) ||
EXPANDED_AGRP(agrp)) ||
( ((filter_mode & ACTFILTER_IPOKEYS) ||
(filter_mode & ACTFILTER_ONLYICU)) &&
- !(filter_mode & ACTFILTER_SEL) ) )
+ (!(filter_mode & ACTFILTER_SEL) ||
(SEL_AGRP(agrp))) ) )
{
if (!(filter_mode & ACTFILTER_FOREDIT) ||
EDITABLE_AGRP(agrp)) {
for (achan= agrp->channels.first; achan
&& achan->grp==agrp; achan= achan->next) {
@@ -2116,7 +2116,7 @@
/* check if we have a corresponding action
channel */
if ((no_name) || (strcmp(achan->name,
achant->name)==0)) {
- actname= achan->name;
+ actname= achant->name;
/* check if this is a constraint
channel */
if (ale->type == ACTTYPE_CONCHAN) {
@@ -2125,7 +2125,7 @@
for
(conchan=achan->constraintChannels.first; conchan; conchan=conchan->next) {
if
(strcmp(conchan->name, conchant->name)==0) {
- conname=
conchan->name;
+ conname=
conchant->name;
ipo_src=
conchan->ipo;
break;
}
@@ -2141,7 +2141,7 @@
else if (ale->ownertype == ACTTYPE_SHAPEKEY) {
/* check if this action channel is
"#ACP_ShapeKey" */
if ((no_name) || (strcmp(achan->name,
"#ACP_ShapeKey")==0)) {
- actname= achan->name;
+ actname= NULL;
ipo_src= achan->ipo;
break;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
