[Bf-blender-cvs] [3cc42b37922] temp-workspace-object-mode-removal: Sync w/ 2.8

[Campbell Barton]

Commit: 3cc42b379220b2d466cc11a094d9798ce807d531
Author: Campbell Barton
Date:   Tue Feb 6 19:53:30 2018 +1100
Branches: temp-workspace-object-mode-removal
https://developer.blender.org/rB3cc42b379220b2d466cc11a094d9798ce807d531

Sync w/ 2.8

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

M	source/blender/blenkernel/intern/object.c
M	source/blender/editors/curve/editcurve.c
M	source/blender/editors/object/object_add.c
M	source/blender/editors/screen/screen_context.c
M	source/blender/editors/sculpt_paint/sculpt_undo.c
M	source/blender/editors/space_outliner/outliner_edit.c
M	source/blender/editors/transform/transform.c
M	source/blender/makesrna/intern/rna_object_force.c

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 9bfc7e466a7..c21aa9d7771 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -541,7 +541,7 @@ bool BKE_object_is_in_editmode_vgroup(Object *ob)
 bool BKE_object_is_in_wpaint_select_vert(const EvaluationContext *eval_ctx, const Object *ob)
 {
 	if (ob->type == OB_MESH) {
-		Mesh *me = ob->data;
+		const Mesh *me = ob->data;
 		return ((eval_ctx->object_mode & OB_MODE_WEIGHT_PAINT) &&
 		        (me->edit_btmesh == NULL) &&
 		        (ME_EDIT_PAINT_SEL_MODE(me) == SCE_SELECT_VERTEX));
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 267a05b46cb..4b578ba389e 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -1286,8 +1286,6 @@ void ED_curve_editnurb_free(Object *obedit)
 
 static int separate_exec(bContext *C, wmOperator *op)
 {
-	EvaluationContext eval_ctx;
-	CTX_data_eval_ctx(C, &eval_ctx);
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	ViewLayer *view_layer = CTX_data_view_layer(C);
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 9b36aec6a5b..eb8e21ef881 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -2336,9 +2336,7 @@ static Base *object_add_duplicate_internal(
  * note: don't call this within a loop since clear_* funcs loop over the entire database.
  * note: caller must do DAG_relations_tag_update(bmain);
  *       this is not done automatic since we may duplicate many objects in a batch */
-Base *ED_object_add_duplicate(
-        Main *bmain, Scene *scene,
-        ViewLayer *view_layer, Base *base, int dupflag)
+Base *ED_object_add_duplicate(Main *bmain, Scene *scene, ViewLayer *view_layer, Base *base, int dupflag)
 {
 	Base *basen;
 	Object *ob;
@@ -2370,8 +2368,6 @@ Base *ED_object_add_duplicate(
 /* contextual operator dupli */
 static int duplicate_exec(bContext *C, wmOperator *op)
 {
-	EvaluationContext eval_ctx;
-	CTX_data_eval_ctx(C, &eval_ctx);
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	ViewLayer *view_layer = CTX_data_view_layer(C);
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index e70dc0cf326..e4c3a051a13 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -42,6 +42,7 @@
 
 #include "BLI_utildefines.h"
 
+
 #include "BKE_context.h"
 #include "BKE_object.h"
 #include "BKE_action.h"
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index 2530a90e75b..3d9021480d9 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -368,7 +368,8 @@ static void sculpt_undo_bmesh_restore_generic(bContext *C,
 }
 
 /* Create empty sculpt BMesh and enable logging */
-static void sculpt_undo_bmesh_enable(Object *ob, SculptUndoNode *unode)
+static void sculpt_undo_bmesh_enable(
+        Object *ob, SculptUndoNode *unode)
 {
 	SculptSession *ss = ob->sculpt;
 	Mesh *me = ob->data;
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c
index 46789eff5e0..25808df807d 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -984,7 +984,7 @@ static int outliner_show_active_exec(bContext *C, wmOperator *UNUSED(op))
 	ViewLayer *view_layer = CTX_data_view_layer(C);
 	ARegion *ar = CTX_wm_region(C);
 	View2D *v2d = &ar->v2d;
-
+	
 	TreeElement *te;
 	int xdelta, ytop;
 
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 0526c8d3d95..9f7b438e338 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2098,8 +2098,6 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 
 	t->context = C;
 
-	CTX_data_eval_ctx(C, &t->eval_ctx);
-
 	/* added initialize, for external calls to set stuff in TransInfo, like undo string */
 
 	t->state = TRANS_STARTING;
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index 8de3b3750ab..cc7339d8f2e 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -33,7 +33,6 @@
 #include "DNA_scene_types.h"
 #include "DNA_smoke_types.h"
 
-
 #include "RNA_define.h"
 #include "RNA_enum_types.h"