Merge branch 'master' into blender2.8

Conflicts:
	intern/ghost/intern/GHOST_ContextCGL.mm
	intern/ghost/intern/GHOST_WindowCocoa.mm
	source/blender/makesrna/intern/rna_main.c

2 files changed, 15 insertions, 1 deletions

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index d7523ea0dfd..39fe914e53c 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1304,4 +1304,18 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 	}
+	if (!MAIN_VERSION_ATLEAST(main, 279, 0)) {
+		if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", "int", "ffmpeg_preset")) {
+			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+				/* "medium" is the preset FFmpeg uses when no presets are given. */
+				scene->r.ffcodecdata.ffmpeg_preset = FFM_PRESET_MEDIUM;
+			}
+		}
+		if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", "int", "constant_rate_factor")) {
+			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+				/* fall back to behaviour from before we introduced CRF for old files */
+				scene->r.ffcodecdata.constant_rate_factor = FFM_CRF_NONE;
+			}
+		}
+	}
 }
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 8e458d14f1f..ed41ac0cb93 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -3720,7 +3720,7 @@ static void write_libraries(WriteData *wd, Main *main)
 				for (id = lbarray[a]->first; id; id = id->next) {
 					if (id->us > 0 && (id->tag & LIB_TAG_EXTERN)) {
 						if (!BKE_idcode_is_linkable(GS(id->name))) {
-							printf("ERROR: write file: datablock '%s' from lib '%s' is not linkable "
+							printf("ERROR: write file: data-block '%s' from lib '%s' is not linkable "
 							       "but is flagged as directly linked", id->name, main->curlib->filepath);
 							BLI_assert(0);
 						}