diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 06:58:46 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 06:58:46 +0300 |
| commit | c312cc171b3e85306fb4c0d67f260bac14af2bfe (patch) | |
| tree | 24358e80fc188ff400d04cb37dd8161515881a23 /source/blender/blenloader | |
| parent | 28316493bd82f5e5d2be40effdad4431f9c49c6e (diff) | |
| parent | bae188bf468313993ac9993c4f8dd0bde1cdfa56 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_250.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index e61cfbf2aac..76162beb1cb 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6341,7 +6341,7 @@ static void direct_link_scene(FileData *fd, Scene *sce) /* recursive link sequences, lb will be correctly initialized */ link_recurs_seq(fd, &ed->seqbase); - SEQ_BEGIN (ed, seq) + SEQ_BEGIN(ed, seq) { seq->seq1 = newdataadr(fd, seq->seq1); seq->seq2 = newdataadr(fd, seq->seq2); diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index d9c0bd8a927..0d7e05edb2d 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -2104,7 +2104,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) for (scene = bmain->scene.first; scene; scene = scene->id.next) { scene->r.ffcodecdata.audio_channels = 2; scene->audio.volume = 1.0f; - SEQ_BEGIN (scene->ed, seq) + SEQ_BEGIN(scene->ed, seq) { seq->pitch = 1.0f; } |