[Bf-blender-cvs] [7e6d7d53cf9] master: Fix memfile undo decoding creating undo steps

Campbell Barton noreply at git.blender.org
Wed Jan 9 07:37:25 CET 2019


Commit: 7e6d7d53cf9d269c402b4eef5eae7b8c363b6707
Author: Campbell Barton
Date:   Wed Jan 9 16:53:44 2019 +1100
Branches: master
https://developer.blender.org/rB7e6d7d53cf9d269c402b4eef5eae7b8c363b6707

Fix memfile undo decoding creating undo steps

Exiting modes shouldn't be needed since loading the new memfile
will free the old data.

Sculpt mode dynamic topology was adding undo data on exiting the mode
which isn't logical in this case and can be avoided altogether.

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

M	source/blender/editors/undo/memfile_undo.c

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

diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c
index 4b38ab282a0..2470acef9aa 100644
--- a/source/blender/editors/undo/memfile_undo.c
+++ b/source/blender/editors/undo/memfile_undo.c
@@ -82,9 +82,6 @@ static bool memfile_undosys_step_encode(struct bContext *C, UndoStep *us_p)
 
 static void memfile_undosys_step_decode(struct bContext *C, UndoStep *us_p, int UNUSED(dir))
 {
-	/* Loading the content will correctly switch into compatible non-object modes. */
-	ED_object_mode_exit(C);
-
 	MemFileUndoStep *us = (MemFileUndoStep *)us_p;
 	BKE_memfile_undo_decode(us->data, C);



More information about the Bf-blender-cvs mailing list