[Bf-blender-cvs] [2fa019fa65b] asset-engine: Fix again 'auto override' system.

Bastien Montagne noreply at git.blender.org
Wed Apr 11 15:16:18 CEST 2018


Commit: 2fa019fa65bc477561cb4cd61c0267464d60a4a6
Author: Bastien Montagne
Date:   Wed Apr 11 15:14:20 2018 +0200
Branches: asset-engine
https://developer.blender.org/rB2fa019fa65bc477561cb4cd61c0267464d60a4a6

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?

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

M	source/blender/blenkernel/intern/undo_system.c

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

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;



More information about the Bf-blender-cvs mailing list