Remove workspace object mode, reverts changes w/ 2.8

This caused too many problems syncing object modes
with multiple objects/windows/workspaces, see: D3130 for details.

1 files changed, 13 insertions, 20 deletions

diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h
index 22933a093ed..761bb7e8acb 100644
--- a/source/blender/blenkernel/BKE_multires.h
+++ b/source/blender/blenkernel/BKE_multires.h
@@ -48,21 +48,20 @@ struct MVert;
 struct MPoly;
 struct MLoopTri;
 
-#include "DNA_object_enums.h"
-
 /* Delete mesh mdisps and grid paint masks */
 void multires_customdata_delete(struct Mesh *me);
 
-void multires_set_tot_level(struct MultiresModifierData *mmd, int lvl, eObjectMode object_mode);
+void multires_set_tot_level(struct Object *ob,
+                            struct MultiresModifierData *mmd, int lvl);
 
 void multires_mark_as_modified(struct Object *ob, enum MultiresModifiedFlags flags);
 
 void multires_force_update(struct Object *ob);
-void multires_force_render_update(struct Object *ob, eObjectMode object_mode);
+void multires_force_render_update(struct Object *ob);
 void multires_force_external_reload(struct Object *ob);
 
 /* internal, only called in subsurf_ccg.c */
-void multires_modifier_update_mdisps(struct DerivedMesh *dm, eObjectMode object_mode);
+void multires_modifier_update_mdisps(struct DerivedMesh *dm);
 void multires_modifier_update_hidden(struct DerivedMesh *dm);
 
 void multiresModifier_set_levels_from_disps(struct MultiresModifierData *mmd, struct Object *ob);
@@ -74,27 +73,21 @@ typedef enum {
 	MULTIRES_IGNORE_SIMPLIFY = 8
 } MultiresFlags;
 
-struct DerivedMesh *multires_make_derived_from_derived(
-        struct DerivedMesh *dm,
-        struct MultiresModifierData *mmd,
-        struct Object *ob,
-        MultiresFlags flags,
-        eObjectMode object_mode);
+struct DerivedMesh *multires_make_derived_from_derived(struct DerivedMesh *dm,
+                                                       struct MultiresModifierData *mmd,
+                                                       struct Object *ob,
+                                                       MultiresFlags flags);
 
 struct MultiresModifierData *find_multires_modifier_before(struct Scene *scene,
                                                            struct ModifierData *lastmd);
 struct MultiresModifierData *get_multires_modifier(struct Scene *scene, struct Object *ob, bool use_first);
 struct DerivedMesh *get_multires_dm(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct MultiresModifierData *mmd,
                                     struct Object *ob);
-void multiresModifier_del_levels(
-        struct MultiresModifierData *, struct Object *, int direction, eObjectMode object_mode);
-void multiresModifier_base_apply(
-        struct MultiresModifierData *mmd, struct Object *ob, eObjectMode object_mode);
-void multiresModifier_subdivide(
-        struct MultiresModifierData *mmd, struct Object *ob, int updateblock, int simple, eObjectMode object_mode);
+void multiresModifier_del_levels(struct MultiresModifierData *, struct Object *, int direction);
+void multiresModifier_base_apply(struct MultiresModifierData *mmd, struct Object *ob);
+void multiresModifier_subdivide(struct MultiresModifierData *mmd, struct Object *ob, int updateblock, int simple);
 void multiresModifier_sync_levels_ex(
-        struct Object *ob_dst, struct MultiresModifierData *mmd_src, struct MultiresModifierData *mmd_dst,
-        eObjectMode object_mode);
+        struct Object *ob_dst, struct MultiresModifierData *mmd_src, struct MultiresModifierData *mmd_dst);
 int multiresModifier_reshape(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct MultiresModifierData *mmd,
                              struct Object *dst, struct Object *src);
 int multiresModifier_reshapeFromDM(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct MultiresModifierData *mmd,
@@ -110,7 +103,7 @@ enum {
 	MULTIRES_SPACE_OBJECT,
 	MULTIRES_SPACE_ABSOLUTE
 };
-void multires_set_space(struct DerivedMesh *dm, struct Object *ob, int from, int to, eObjectMode object_mode);
+void multires_set_space(struct DerivedMesh *dm, struct Object *ob, int from, int to);
 
 /* Related to the old multires */
 void multires_free(struct Multires *mr);