[Bf-blender-cvs] [a6edc128403] undo-experiments-swap-reread-datablocks: Merge branch 'undo-experiments' into undo-experiments-swap-reread-datablocks

[Bastien Montagne]

Commit: a6edc128403d57cc151b0f6dffc8bbfe3a69e1ff
Author: Bastien Montagne
Date:   Sat Feb 1 19:44:28 2020 +0100
Branches: undo-experiments-swap-reread-datablocks
https://developer.blender.org/rBa6edc128403d57cc151b0f6dffc8bbfe3a69e1ff

Merge branch 'undo-experiments' into undo-experiments-swap-reread-datablocks

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



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

diff --cc source/blender/editors/undo/memfile_undo.c
index 7083b23531f,7d143864624..10b1ce02b80
--- a/source/blender/editors/undo/memfile_undo.c
+++ b/source/blender/editors/undo/memfile_undo.c
@@@ -163,10 -165,11 +165,9 @@@ static void memfile_undosys_step_decode
       * future' we can still re-use old data. However, if *next* undo step (i.e. the one immédiately
       * in the future, the one we are comming from) is a barrier, then we have to force a complete
       * undo.
 -     * Likewise, if next step (the one we are comming from) was a non-memfile one, there is no
 -     * guarantee that current bmain data actually reflects the status of unchanged datablocks in
 -     * memfile, since changes might have been flushed to current bmain data without triggering any
 -     * memfile step storage (typical common case e.g. when using edit modes).
 +     * Note that non-memfile undo steps **should** not be an issue anymore, since we handle
 +     * fine-grained update flags now.
       */
-     BLI_assert(undo_direction < 0);
      UndoStep *us_next = us_p->next;
      if (us_next != NULL) {
        if (us_next->use_old_bmain_data == false) {