[Bf-blender-cvs] [9586e36fdc3] workspaces: Fix workspace mode syncing

[Campbell Barton]

Commit: 9586e36fdc38f24d6f2f8109620824f3cb9ecc45
Author: Campbell Barton
Date:   Wed Apr 5 16:39:01 2017 +1000
Branches: workspaces
https://developer.blender.org/rB9586e36fdc38f24d6f2f8109620824f3cb9ecc45

Fix workspace mode syncing

Toggling off a mode didn't correctly update the workspace.

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

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 26f7170f7a4..fe232e37886 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1626,10 +1626,15 @@ void ED_object_toggle_modes(bContext *C, int mode)
 		if (opstring) {
 #ifdef USE_WORKSPACE_MODE
 			WorkSpace *workspace = CTX_wm_workspace(C);
-
-			BKE_workspace_object_mode_set(workspace, mode);
 #endif
 			WM_operator_name_call(C, opstring, WM_OP_EXEC_REGION_WIN, NULL);
+
+#ifdef USE_WORKSPACE_MODE
+			Object *ob = CTX_data_active_object(C);
+			if (ob) {
+				BKE_workspace_object_mode_set(workspace, ob->mode);
+			}
+#endif
 		}
 	}
 }