Commit: bb9719b7ab236508c587bd51beeff9b4d85b58e7
Author: Campbell Barton
Date: Wed Jun 18 16:29:03 2014 +1000
https://developer.blender.org/rBbb9719b7ab236508c587bd51beeff9b4d85b58e7
Code cleanup: replace direct operator calls with ED_object_toggle_modes
===================================================================
M source/blender/editors/object/object_edit.c
===================================================================
diff --git a/source/blender/editors/object/object_edit.c
b/source/blender/editors/object/object_edit.c
index 62a31a3..aba7924 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1620,20 +1620,20 @@ static int object_mode_set_exec(bContext *C, wmOperator
*op)
/* Exit current mode if it's not the mode we're setting */
if (mode != OB_MODE_OBJECT && (ob->mode != mode || toggle)) {
/* Enter new mode */
- WM_operator_name_call(C, object_mode_op_string(mode),
WM_OP_EXEC_REGION_WIN, NULL);
+ ED_object_toggle_modes(C, mode);
}
if (toggle) {
/* Special case for Object mode! */
if (mode == OB_MODE_OBJECT && restore_mode == OB_MODE_OBJECT &&
ob->restore_mode != OB_MODE_OBJECT) {
- WM_operator_name_call(C,
object_mode_op_string(ob->restore_mode), WM_OP_EXEC_REGION_WIN, NULL);
+ ED_object_toggle_modes(C, ob->restore_mode);
}
else if (ob->mode == mode) {
/* For toggling, store old mode so we know what to go
back to */
ob->restore_mode = restore_mode;
}
else if (ob->restore_mode != OB_MODE_OBJECT && ob->restore_mode
!= mode) {
- WM_operator_name_call(C,
object_mode_op_string(ob->restore_mode), WM_OP_EXEC_REGION_WIN, NULL);
+ ED_object_toggle_modes(C, ob->restore_mode);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
