Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 03:58:46 +0000 (14:58 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 03:58:46 +0000 (14:58 +1100)
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_250.c
source/creator/creator.c

index e61cfbf2aacb8c1e5572b0ab909f793df7c627ef..76162beb1cbfbc8c20fea1e08919a779ef0b67c1 100644 (file)
@@ -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);
index d9c0bd8a9275e6a6d9b1cc3d8b2585a274f7ccf4..0d7e05edb2d753a6e79fd2f227654bc98b11d1a5 100644 (file)
@@ -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;
                                }
index ce25a71c6d84f1036ce8854c3a98e58cf842dc98..a32acc752484dbf406bc3c49e08703ed370ad186 100644 (file)
@@ -52,7 +52,6 @@
 #include "BLI_callbacks.h"
 #include "BLI_string.h"
 #include "BLI_system.h"
-#include "BLI_threads.h"
 
 /* mostly init functions */
 #include "BKE_appdir.h"