diff options
Diffstat (limited to 'source/blender/blenkernel/intern/action.c')
| -rw-r--r-- | source/blender/blenkernel/intern/action.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index e0afdec5e23..1c720cea21f 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -64,7 +64,7 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "nla.h" +//XXX #include "nla.h" /* *********************** NOTE ON POSE AND ACTION ********************** @@ -195,9 +195,9 @@ bAction *copy_action (bAction *src) dst= copy_libblock(src); - duplicatelist(&(dst->chanbase), &(src->chanbase)); - duplicatelist(&(dst->groups), &(src->groups)); - duplicatelist(&(dst->markers), &(src->markers)); + BLI_duplicatelist(&(dst->chanbase), &(src->chanbase)); + BLI_duplicatelist(&(dst->groups), &(src->groups)); + BLI_duplicatelist(&(dst->markers), &(src->markers)); for (dchan=dst->chanbase.first, schan=src->chanbase.first; dchan; dchan=dchan->next, schan=schan->next) { for (dgrp=dst->groups.first, sgrp=src->groups.first; dgrp && sgrp; dgrp=dgrp->next, sgrp=sgrp->next) { @@ -299,7 +299,7 @@ void copy_pose(bPose **dst, bPose *src, int copycon) outPose= MEM_callocN(sizeof(bPose), "pose"); - duplicatelist(&outPose->chanbase, &src->chanbase); + BLI_duplicatelist (&outPose->chanbase, &src->chanbase); if (copycon) { for (pchan=outPose->chanbase.first; pchan; pchan=pchan->next) { @@ -363,7 +363,7 @@ void game_copy_pose(bPose **dst, bPose *src) out= MEM_dupallocN(src); out->agroups.first= out->agroups.last= NULL; - duplicatelist(&out->chanbase, &src->chanbase); + BLI_duplicatelist(&out->chanbase, &src->chanbase); /* remap pointers */ ghash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp); |