[Bf-blender-cvs] [127d515f3d3] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 127d515f3d3309b4b9311978b0bcddaa28c65cf5
Author: Campbell Barton
Date:   Thu Feb 8 21:43:37 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB127d515f3d3309b4b9311978b0bcddaa28c65cf5

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/object/object_bake_api.c
index 50922be76eb,c78b9b37da1..c8bcc9224e9
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@@ -621,13 -619,11 +621,11 @@@ static size_t initialize_internal_image
  }
  
  /* create new mesh with edit mode changes and modifiers applied */
 -static Mesh *bake_mesh_new_from_object(Main *bmain, Scene *scene, Object *ob)
 +static Mesh *bake_mesh_new_from_object(EvaluationContext *eval_ctx, Main *bmain, Scene *scene, Object *ob)
  {
- 	if (eval_ctx->object_mode & OB_MODE_EDIT) {
- 		ED_object_editmode_load(ob);
- 	}
+ 	ED_object_editmode_load(ob);
  
 -	Mesh *me = BKE_mesh_new_from_object(bmain, scene, ob, 1, 2, 0, 0);
 +	Mesh *me = BKE_mesh_new_from_object(eval_ctx, bmain, scene, ob, 1, 2, 0, 0);
  	if (me->flag & ME_AUTOSMOOTH) {
  		BKE_mesh_split_faces(me, true);
  	}