[Bf-blender-cvs] [b9cbb229b18] master: Fix app-template settings being used for non-template preferences

[Campbell Barton]

Commit: b9cbb229b1848bf71dae41c0b873def75ce3e32b
Author: Campbell Barton
Date:   Wed Oct 5 15:30:46 2022 +1100
Branches: master
https://developer.blender.org/rBb9cbb229b1848bf71dae41c0b873def75ce3e32b

Fix app-template settings being used for non-template preferences

Saving non app-template preferences would use add-ons and other
app-template settings to write the default preferences if there was no
existing user preferences file saved.

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

M	source/blender/blenkernel/intern/blendfile.c

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

diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index 4601fc1fc3a..ba208f688ee 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -720,7 +720,7 @@ bool BKE_blendfile_userdef_write_app_template(const char *filepath, ReportList *
   UserDef *userdef_default = BLI_exists(filepath) ? BKE_blendfile_userdef_read(filepath, NULL) :
                                                     NULL;
   if (userdef_default == NULL) {
-    return BKE_blendfile_userdef_write(filepath, reports);
+    userdef_default = BKE_blendfile_userdef_from_defaults();
   }
 
   BKE_blender_userdef_app_template_data_swap(&U, userdef_default);