Merge branch 'master' into greasepencil-objectgreasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/space_userpref.py
	source/blender/blenkernel/BKE_gpencil.h
	source/blender/blenkernel/BKE_gpencil_update_cache.h
	source/blender/blenkernel/CMakeLists.txt
	source/blender/blenkernel/intern/gpencil.c
	source/blender/blenkernel/intern/gpencil_update_cache.c
	source/blender/blenlib/BLI_listbase.h
	source/blender/blenlib/intern/DLRB_tree.c
	source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
	source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc
	source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.h
	source/blender/makesdna/DNA_gpencil_types.h
	source/blender/makesrna/intern/rna_gpencil.c

1 files changed, 1 insertions, 1 deletions

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index aa3eef4b475..4eda63d0817 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -999,7 +999,7 @@ static void write_libraries(WriteData *wd, Main *main)
             if (!BKE_idtype_idcode_is_linkable(GS(id->name))) {
               printf(
                   "ERROR: write file: data-block '%s' from lib '%s' is not linkable "
-                  "but is flagged as directly linked",
+                  "but is flagged as directly linked\n",
                   id->name,
                   main->curlib->filepath_abs);
               BLI_assert(0);