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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-04-11 16:14:20 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-04-11 16:23:54 +0300
commitc1680902ac9a0a6431a2ae5258b0806b60a95a75 (patch)
tree6621c019c05f8345cb8fca5916bdb6f25c36280e /source/blender/blenkernel/intern/undo_system.c
parent9ec26c415a183673e02fdadf2f1bd47c5a8bc526 (diff)
Fix again 'auto override' system.
Got lost in big undo refactor. Note that this is probably (maybe) not how we want to have it in the end, things like EditMode undo should probably not trigger this check?
Diffstat (limited to 'source/blender/blenkernel/intern/undo_system.c')
-rw-r--r--source/blender/blenkernel/intern/undo_system.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c
index 760c6a60976..40cdd57fc3b 100644
--- a/source/blender/blenkernel/intern/undo_system.c
+++ b/source/blender/blenkernel/intern/undo_system.c
@@ -39,6 +39,7 @@
#include "BKE_context.h"
#include "BKE_global.h"
+#include "BKE_library_override.h"
#include "BKE_main.h"
#include "BKE_undo_system.h"
@@ -392,6 +393,10 @@ bool BKE_undosys_step_push_with_type(UndoStack *ustack, bContext *C, const char
undosys_stack_validate(ustack, false);
bool is_not_empty = ustack->step_active != NULL;
+ /* Might not be final place for this to be called - probably only want to call it from some
+ * undo handlers, not all of them? */
+ BKE_main_override_static_operations_create(CTX_data_main(C));
+
/* Remove all undos after (also when 'ustack->step_active == NULL'). */
while (ustack->steps.last != ustack->step_active) {
UndoStep *us_iter = ustack->steps.last;