[Bf-blender-cvs] [7aba5ebfc25] temp-workspace-addons: Correct merge

[Campbell Barton]

Commit: 7aba5ebfc25b3c4c74f1b5d38b4f14d4b8e22e3c
Author: Campbell Barton
Date:   Thu Feb 1 15:30:57 2018 +1100
Branches: temp-workspace-addons
https://developer.blender.org/rB7aba5ebfc25b3c4c74f1b5d38b4f14d4b8e22e3c

Correct merge

===================================================================

M	source/blender/blenloader/intern/writefile.c

===================================================================

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index a093fa19d0a..90b8527ad1c 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -4117,7 +4117,7 @@ static bool write_file_handle(
 	mywrite_flush(wd);
 
 	if (write_flags & G_FILE_USERPREFS) {
-		write_userdef(wd);
+		write_userdef(wd, &U);
 	}
 
 	/* Write DNA last, because (to be implemented) test for which structs are written.