Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 13 Mar 2018 15:15:37 +0000 (02:15 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 13 Mar 2018 15:15:37 +0000 (02:15 +1100)
20 files changed:
1  2 
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/editors/armature/armature_naming.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/interface/interface_icons.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_utils.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_view3d/view3d_camera_control.c
source/blender/editors/transform/transform_snap_object.c
source/blender/editors/util/editmode_undo.c
source/blender/makesdna/intern/dna_genfile.c
source/blender/makesrna/intern/rna_object.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/stubs.c

index 73d3e30ee874015aa713cb70d7fdcfe971be6892,efad8e48e3dd7f6e430862f655d903b45d5ff4f1..6427a87a1822acf8f40225766d76a8fa325ea1f5
@@@ -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;
  
index 9d8bd4a87188495cbc4b0f5c8822675f3de58d57,add2ab9865212f7ffa614b7d9ab4ac30cc9f3f47..18288613f6d7dcc36dfb604256995a7e5a4dea44
@@@ -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)) {
index 93546b1bd5d81db68c89d5bf3d420f2e947660ed,e9203fa1972f1fd87ba417fc27919f93b49a0c19..3ff794772fac37c63e8ef2e4beb2a05ea8ac591b
@@@ -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;
  
index 3c54c6d0d5a1369038474484fc52af9d5d15b85c,83d67cea2f09c155b3c64ba1327473c2f8de9d7c..5e7e0fb68a3f5e7beafa78a1d7e22610285aa56b
@@@ -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;
  
index b13bf07761fdb3c8e8794a053278c4df9ad33f51,1d77030fe00d841de93d4a77f5659b11657ae554..12140e3a8ed941f866082e6c07472e823bcf5837
@@@ -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);