[Bf-blender-cvs] [585208e0e91] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 585208e0e911c985a062dd74b6cc689e4fb63ef8
Author: Campbell Barton
Date:   Wed Mar 14 02:15:37 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB585208e0e911c985a062dd74b6cc689e4fb63ef8

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 73d3e30ee87,efad8e48e3d..6427a87a182
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -692,16 -690,9 +692,16 @@@ bool BKE_node_tree_iter_step(struct Nod
  }
  /** \} */
  
 +
 +/* -------------------------------------------------------------------- */
 +/** \name Node Tree
 + */
 +
 +void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree, struct Scene *scene, const int layer_index);
 +
  /* -------------------------------------------------------------------- */
  /** \name Shader Nodes
-  */
+  * \{ */
  struct ShadeInput;
  struct ShadeResult;
  
diff --cc source/blender/editors/object/object_edit.c
index 9d8bd4a8718,add2ab98652..18288613f6d
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@@ -373,9 -560,11 +373,9 @@@ void ED_object_editmode_enter(bContext 
  	if (ob->type == OB_MESH) {
  		BMEditMesh *em;
  		ok = 1;
 -		scene->obedit = ob;  /* context sees this */
 -
  		const bool use_key_index = mesh_needs_keyindex(ob->data);
  
- 		EDBM_mesh_make(scene->toolsettings, ob, use_key_index);
+ 		EDBM_mesh_make(ob, scene->toolsettings->selectmode, use_key_index);
  
  		em = BKE_editmesh_from_object(ob);
  		if (LIKELY(em)) {
diff --cc source/blender/editors/object/object_hook.c
index 93546b1bd5d,e9203fa1972..3ff794772fa
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@@ -319,9 -316,9 +319,9 @@@ static bool object_hook_index_array(Sce
  			BMEditMesh *em;
  
  			EDBM_mesh_load(obedit);
- 			EDBM_mesh_make(scene->toolsettings, obedit, true);
+ 			EDBM_mesh_make(obedit, scene->toolsettings->selectmode, true);
  
 -			DAG_id_tag_update(obedit->data, 0);
 +			DEG_id_tag_update(obedit->data, 0);
  
  			em = me->edit_btmesh;
  
diff --cc source/blender/editors/object/object_relations.c
index 3c54c6d0d5a,83d67cea2f0..5e7e0fb68a3
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@@ -150,9 -140,9 +150,9 @@@ static int vertex_parent_set_exec(bCont
  		BMEditMesh *em;
  
  		EDBM_mesh_load(obedit);
- 		EDBM_mesh_make(scene->toolsettings, obedit, true);
+ 		EDBM_mesh_make(obedit, scene->toolsettings->selectmode, true);
  
 -		DAG_id_tag_update(obedit->data, 0);
 +		DEG_id_tag_update(obedit->data, 0);
  
  		em = me->edit_btmesh;
  
diff --cc source/blender/makesrna/intern/rna_object.c
index b13bf07761f,1d77030fe00..12140e3a8ed
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@@ -312,9 -273,9 +312,9 @@@ static void rna_Object_active_shape_upd
  		switch (ob->type) {
  			case OB_MESH:
  				EDBM_mesh_load(ob);
- 				EDBM_mesh_make(scene->toolsettings, ob, true);
+ 				EDBM_mesh_make(ob, scene->toolsettings->selectmode, true);
  
 -				DAG_id_tag_update(ob->data, 0);
 +				DEG_id_tag_update(ob->data, 0);
  
  				EDBM_mesh_normals_update(((Mesh *)ob->data)->edit_btmesh);
  				BKE_editmesh_tessface_calc(((Mesh *)ob->data)->edit_btmesh);