diff options
Diffstat (limited to 'source/blender/blenkernel/intern/nla.c')
| -rw-r--r-- | source/blender/blenkernel/intern/nla.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 0527df67033..c321bc92a71 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -183,7 +183,7 @@ NlaStrip *copy_nlastrip(NlaStrip *strip, const bool use_same_action) } else { /* use a copy of the action instead (user count shouldn't have changed yet) */ - strip_d->act = BKE_action_copy(strip_d->act); + strip_d->act = BKE_action_copy(G.main, strip_d->act); } } @@ -1291,7 +1291,7 @@ void BKE_nlastrip_recalculate_bounds(NlaStrip *strip) if (IS_EQF(mapping, 0.0f) == 0) strip->end = (actlen * mapping) + strip->start; - /* make sure we don't overlap our neighbours */ + /* make sure we don't overlap our neighbors */ nlastrip_fix_resize_overlaps(strip); } |