[Bf-blender-cvs] [bbe3b57c72d] undo-experiments: Merge branch 'master' into undo-experiments

[Bastien Montagne]

Commit: bbe3b57c72d6239be143d420e3e13c9e8ca9ff80
Author: Bastien Montagne
Date:   Mon Feb 10 18:21:50 2020 +0100
Branches: undo-experiments
https://developer.blender.org/rBbbe3b57c72d6239be143d420e3e13c9e8ca9ff80

Merge branch 'master' into undo-experiments

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index 8889b85e8a0,30ba20b97da..b08b3926bdc
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -3927,12 -3927,8 +3927,12 @@@ static bool write_file_handle(Main *mai
          }
  
          if (do_override) {
-           BKE_override_library_operations_store_end(override_storage, id);
+           BKE_lib_override_library_operations_store_end(override_storage, id);
          }
 +
 +        if (wd->use_memfile) {
 +          mywrite_flush(wd);
 +        }
        }
  
        mywrite_flush(wd);