Merging trunk up to r39145.
[blender-staging.git] / source / blender / windowmanager / intern / wm_files.c
index 20f9d2237c2d9e0905c6f89ba077cdf286467557..7563838239910a5c92b7b968940d04d0a5c5d46b 100644 (file)
@@ -387,7 +387,12 @@ void WM_read_file(bContext *C, const char *filepath, ReportList *reports)
                
                if (retval != BKE_READ_FILE_FAIL) {
                        G.relbase_valid = 1;
-                       if(!G.background) /* assume automated tasks with background, dont write recent file list */
+                       
+                       /* dont write recent file list if:
+                        * 1) assuming automated tasks with background
+                        * 2) user preference to not do this is enabled (i.e. developer testing mode)
+                        */
+                       if (!G.background && !(U.flag & USER_NO_RECENTLOAD_UPDATE))
                                write_history();
                }