Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix bug with NULL context being used in undo

Browse Source 
Caused sculpt to crash.
This commit is contained in:
Campbell Barton
2018-04-19 11:12:57 +02:00
parent a8db1efbcf
commit f2a3579661
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/undo_system.c
View File

@@ -387,6 +387,9 @@ UndoStep *BKE_undosys_step_push_init(UndoStack *ustack, bContext *C, const char
return BKE_undosys_step_push_init_with_type(ustack, C, name, ut); return BKE_undosys_step_push_init_with_type(ustack, C, name, ut);
} }
/**
* \param C: Can be NULL from some callers if their encoding function doesn't need it
*/
bool BKE_undosys_step_push_with_type(UndoStack *ustack, bContext *C, const char *name, const UndoType *ut) bool BKE_undosys_step_push_with_type(UndoStack *ustack, bContext *C, const char *name, const UndoType *ut)
{ {
UNDO_NESTED_ASSERT(false); UNDO_NESTED_ASSERT(false);
@@ -395,7 +398,7 @@ bool BKE_undosys_step_push_with_type(UndoStack *ustack, bContext *C, const char
/* Might not be final place for this to be called - probably only want to call it from some /* Might not be final place for this to be called - probably only want to call it from some
* undo handlers, not all of them? */ * undo handlers, not all of them? */
BKE_main_override_static_operations_create(CTX_data_main(C), false); BKE_main_override_static_operations_create(G.main, false);
/* Remove all undos after (also when 'ustack->step_active == NULL'). */ /* Remove all undos after (also when 'ustack->step_active == NULL'). */
while (ustack->steps.last != ustack->step_active) { while (ustack->steps.last != ustack->step_active) {