diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-09-19 16:41:26 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-09-19 16:41:26 +0400 |
| commit | ef8a1dccc726f6212e23b1c1978c2e0a2baf5a47 (patch) | |
| tree | ed3f7d28da99e8b438823887e1aa7897496c67c8 | |
| parent | 9c27e097df380dd1b83c0816a7777be1cf36dc4d (diff) | |
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.
| -rw-r--r-- | source/blender/src/editaction.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index fe83976ee57..220265fcbaf 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -2102,7 +2102,7 @@ void paste_actdata () /* 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 @@ void paste_actdata () } /* 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 */ |