[Bf-blender-cvs] [0472220d7d0] temp-workspace-object-mode-removal: Merge branch '28' into temp-workspace-object-mode-removal

[Campbell Barton]

Commit: 0472220d7d0a345816e54022a69e0fde4577d423
Author: Campbell Barton
Date:   Tue Feb 6 23:50:04 2018 +1100
Branches: temp-workspace-object-mode-removal
https://developer.blender.org/rB0472220d7d0a345816e54022a69e0fde4577d423

Merge branch '28' into temp-workspace-object-mode-removal

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



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

diff --cc source/blender/editors/include/ED_object.h
index ae06d21a350,5c04614f4f1..f5047d8a338
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@@ -56,8 -56,9 +56,10 @@@ struct PointerRNA
  struct PropertyRNA;
  struct EnumPropertyItem;
  struct EvaluationContext;
 +struct WorkSpace;
  
+ #include "DNA_object_enums.h"
+ 
  /* object_edit.c */
  struct Object *ED_object_context(struct bContext *C);               /* context.object */
  struct Object *ED_object_active_context(struct bContext *C); /* context.object or context.active_object */
@@@ -115,8 -116,8 +117,8 @@@ struct Base *ED_object_add_duplicate(st
  
  void ED_object_parent(struct Object *ob, struct Object *parent, const int type, const char *substr);
  
- bool ED_object_mode_compat_set(struct bContext *C, struct WorkSpace *workspace, int mode, struct ReportList *reports);
- void ED_object_toggle_modes(struct bContext *C, int mode);
 -bool ED_object_mode_compat_set(struct bContext *C, struct Object *ob, eObjectMode mode, struct ReportList *reports);
++bool ED_object_mode_compat_set(struct bContext *C, struct WorkSpace *workspace, eObjectMode mode, struct ReportList *reports);
+ void ED_object_toggle_modes(struct bContext *C, eObjectMode mode);
  
  /* bitflags for enter/exit editmode */
  #define EM_FREEDATA     1
diff --cc source/blender/editors/object/object_edit.c
index 668d027cd03,5255f8b507c..bc02f09ab35
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@@ -1547,14 -1545,18 +1547,14 @@@ static bool object_mode_compat_test(Obj
   *
   * This is so each mode's exec function can call
   */
- bool ED_object_mode_compat_set(bContext *C, WorkSpace *workspace, int mode, ReportList *reports)
 -bool ED_object_mode_compat_set(bContext *C, Object *ob, eObjectMode mode, ReportList *reports)
++bool ED_object_mode_compat_set(bContext *C, WorkSpace *workspace, eObjectMode mode, ReportList *reports)
  {
  	bool ok;
 -	if (!ELEM(ob->mode, mode, OB_MODE_OBJECT)) {
 -		const char *opstring = object_mode_op_string(ob->mode);
 +	if (!ELEM(workspace->object_mode, mode, OB_MODE_OBJECT)) {
 +		const char *opstring = object_mode_op_string(workspace->object_mode);
  
  		WM_operator_name_call(C, opstring, WM_OP_EXEC_REGION_WIN, NULL);
 -#ifdef USE_WORKSPACE_MODE
 -		BKE_workspace_object_mode_set(CTX_wm_workspace(C), CTX_data_scene(C), ob->mode);
 -#endif
 -
 -		ok = ELEM(ob->mode, mode, OB_MODE_OBJECT);
 +		ok = ELEM(workspace->object_mode, mode, OB_MODE_OBJECT);
  		if (!ok) {
  			wmOperatorType *ot = WM_operatortype_find(opstring, false);
  			BKE_reportf(reports, RPT_ERROR, "Unable to execute '%s', error changing modes", ot->name);