Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 19 Feb 2018 06:46:42 +0000 (17:46 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 19 Feb 2018 06:46:42 +0000 (17:46 +1100)
1  2 
source/blender/blenkernel/intern/scene.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/editmesh_utils.c
source/blender/python/bmesh/bmesh_py_types.c

index 932f80c35d523c1858461cb32693626fb24f589f,423ed2af057ad698dd211b4d7216d54ca3afb9d7..899a911270f0383cd2fb8fbc671f91f4a7f552fa
@@@ -1396,8 -1851,12 +1396,12 @@@ static void prepare_mesh_for_viewport_r
                {
                        if (check_rendered_viewport_visible(bmain)) {
                                BMesh *bm = mesh->edit_btmesh->bm;
-                               BM_mesh_bm_to_me(bm, mesh, (&(struct BMeshToMeshParams){0}));
+                               BM_mesh_bm_to_me(
+                                       bm, mesh,
+                                       (&(struct BMeshToMeshParams){
+                                           .calc_object_remap = true,
+                                       }));
 -                              DAG_id_tag_update(&mesh->id, 0);
 +                              DEG_id_tag_update(&mesh->id, 0);
                        }
                }
        }
index ff1cd7224cd3f21b2811e7a2ee44ab71bb1137f3,c979a73e9645b70985d681b26fb1dd0885c5b74c..a71b03b6ff7a2f290d9600358b25c9193d33b9e6
@@@ -3374,9 -3357,13 +3374,13 @@@ static int edbm_separate_exec(bContext 
                                        }
  
                                        if (retval_iter) {
-                                               BM_mesh_bm_to_me(bm_old, me, (&(struct BMeshToMeshParams){0}));
+                                               BM_mesh_bm_to_me(
+                                                       bm_old, me,
+                                                       (&(struct BMeshToMeshParams){
+                                                           .calc_object_remap = true,
+                                                       }));
  
 -                                              DAG_id_tag_update(&me->id, OB_RECALC_DATA);
 +                                              DEG_id_tag_update(&me->id, OB_RECALC_DATA);
                                                WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
                                        }
  
index 629c3a3c7a33abcaf65ce45496079d33054e812e,2866683b89b81a1ea47dbebfb0c17c70738e7791..ec787768a57bb36bebe8273d537c03a486aee6bb
@@@ -902,7 -901,14 +902,11 @@@ static PyObject *bpy_bmesh_to_mesh(BPy_
  
        bm = self->bm;
  
-       BM_mesh_bm_to_me(bm, me, (&(struct BMeshToMeshParams){0}));
 -      /* python won't ensure matching uv/mtex */
 -      BM_mesh_cd_validate(bm);
 -
+       BM_mesh_bm_to_me(
+               bm, me,
+               (&(struct BMeshToMeshParams){
+                   .calc_object_remap = true,
+               }));
  
        /* we could have the user do this but if they forget blender can easy crash
         * since the references arrays for the objects derived meshes are now invalid */