Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-15 20:53:34 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-15 20:53:34 +0300
commit599bf05c5683e0314e4dfdf03b21246fe99f7056 (patch)
tree0c95c7aa81fb4568ed4a4cf73aac3fdcb7eb3937 /source/blender/blenkernel/intern/undo_system.c
parentbf0d16e30ebd692d2e9ce8b5251ffa467e3fed7d (diff)
parent4461be1b722a4f6e5af4854eb12023b3670a4c3d (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/undo_system.c')
-rw-r--r--source/blender/blenkernel/intern/undo_system.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c
index 62710240109..f5e4c354a02 100644
--- a/source/blender/blenkernel/intern/undo_system.c
+++ b/source/blender/blenkernel/intern/undo_system.c
@@ -252,6 +252,15 @@ void BKE_undosys_stack_init_from_main(UndoStack *ustack, struct Main *bmain)
undosys_stack_push_main(ustack, "original", bmain);
}
+/* called after 'BKE_undosys_stack_init_from_main' */
+void BKE_undosys_stack_init_from_context(UndoStack *ustack, bContext *C)
+{
+ const UndoType *ut = BKE_undosys_type_from_context(C);
+ if ((ut != NULL) && (ut != BKE_UNDOSYS_TYPE_MEMFILE) && (ut->mode == BKE_UNDOTYPE_MODE_STORE)) {
+ BKE_undosys_step_push_with_type(ustack, C, "original mode", ut);
+ }
+}
+
/* name optional */
bool BKE_undosys_stack_has_undo(UndoStack *ustack, const char *name)
{