X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fauto.C;h=f4e751aa0e7a5dc8abd840aed8456bb2784ad795;hp=03d4aa016eb5d72b67122f79554e0f9ae8aad314;hb=refs%2Fheads%2Fmaster;hpb=22c6251d37911a11e322bf7518e6a992ea0bb6c7 diff --git a/cinelerra-5.1/cinelerra/auto.C b/cinelerra-5.1/cinelerra/auto.C index 03d4aa01..f4e751aa 100644 --- a/cinelerra-5.1/cinelerra/auto.C +++ b/cinelerra-5.1/cinelerra/auto.C @@ -2,6 +2,7 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams + * Copyright (C) 2003-2016 Cinelerra CV contributors * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,7 +70,7 @@ void Auto::copy(int64_t start, int64_t end, FileXML *file, int default_only) void Auto::copy_from(Auto *that) { - this->orig_id = orig_id; + this->orig_id = that->orig_id; this->position = that->position; } @@ -79,8 +80,11 @@ int Auto::interpolate_from(Auto *a1, Auto *a2, int64_t new_position, Auto *templ if( !templ ) templ = previous; if( !templ && this->autos ) templ = this->autos->default_auto; - if( templ ) + if( templ ) { + int orig_id = this->orig_id; copy_from(templ); + this->orig_id = orig_id; + } position = new_position; return 0; }