griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix mode switching error on undo

Browse Source 
For 2.8 there is already a utility function for this,
wrap it - avoiding an undo step.
This commit is contained in:
Campbell Barton
2018-04-03 08:03:43 +02:00
parent 751782c8df
commit a7a25fed2b
1 changed files with 5 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/blender/editors/object/object_modes.c
View File

@@ -156,42 +156,11 @@ void ED_object_mode_toggle(bContext *C, eObjectMode mode)
/* Wrapper for operator */
void ED_object_mode_set(bContext *C, eObjectMode mode)
{
#if 0
wmOperatorType *ot = WM_operatortype_find("OBJECT_OT_mode_set", false);
PointerRNA ptr;
WM_operator_properties_create_ptr(&ptr, ot);
RNA_enum_set(&ptr, "mode", mode);
RNA_boolean_set(&ptr, "toggle", false);
WM_operator_name_call_ptr(C, ot, WM_OP_EXEC_DEFAULT, &ptr);
WM_operator_properties_free(&ptr);
#else
const WorkSpace *workspace = CTX_wm_workspace(C);
Object *ob = CTX_data_active_object(C);
if (ob == NULL) {
return;
}
if (workspace->object_mode == mode) {
/* pass */
}
else if (workspace->object_mode != OB_MODE_OBJECT) {
if (ob && (workspace->object_mode & mode) == 0) {
/* needed so we don't do undo pushes. */
wmWindowManager *wm = CTX_wm_manager(C);
wm->op_undo_depth++;
ED_object_mode_toggle(C, mode);
wm->op_undo_depth--;
}
}
else {
/* needed so we don't do undo pushes. */
wmWindowManager *wm = CTX_wm_manager(C);
wm->op_undo_depth++;
ED_object_mode_toggle(C, workspace->object_mode);
wm->op_undo_depth--;
}
#endif
wmWindowManager *wm = CTX_wm_manager(C);
wm->op_undo_depth++;
/* needed so we don't do undo pushes. */
ED_object_mode_generic_enter(C, mode);
wm->op_undo_depth--;
}
/** \} */