Revision: 16607
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16607
Author: aligorith
Date: 2008-09-19 14:41:26 +0200 (Fri, 19 Sep 2008)
Log Message:
-----------
Bugfix #17643: Action Editor buffer copy/paste not working
Removed superfluous check for destination IPO-block/IPO-curve which may not
have existed. This meant that pasting keyframes into an "empty" Action Channel
sometimes failed.
Modified Paths:
--------------
trunk/blender/source/blender/src/editaction.c
Modified: trunk/blender/source/blender/src/editaction.c
===================================================================
--- trunk/blender/source/blender/src/editaction.c 2008-09-19 12:33:17 UTC
(rev 16606)
+++ trunk/blender/source/blender/src/editaction.c 2008-09-19 12:41:26 UTC
(rev 16607)
@@ -2102,7 +2102,7 @@
/* from selected channels */
for (ale= act_data.first; ale; ale= ale->next) {
- Ipo *ipo_src=NULL, *ipo_dst=ale->key_data;
+ Ipo *ipo_src=NULL;
bActionChannel *achan;
IpoCurve *ico, *icu;
BezTriple *bezt;
@@ -2149,12 +2149,12 @@
}
/* this shouldn't happen, but it might */
- if (ELEM(NULL, ipo_src, ipo_dst))
+ if (ipo_src == NULL)
continue;
/* loop over curves, pasting keyframes */
for (ico= ipo_src->curve.first; ico; ico= ico->next) {
- icu= verify_ipocurve((ID*)ob, ico->blocktype, actname,
conname, "", ico->adrcode, 1);
+ icu= verify_ipocurve((ID*)ob, ico->blocktype, actname,
conname, NULL, ico->adrcode, 1);
if (icu) {
/* just start pasting, with the the first
keyframe on the current frame, and so on */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
