Merge branch 'master' into blender2.8

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);

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;
 				}

source/creator/creator.c

@@ -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"