Merge branch 'master' into blender2.8
[blender.git] / source / blender / bmesh / intern / bmesh_mesh.c
index 7f7f48e37bd08416d59c62b9bf00055c3de574f8..ef7b54195ffc56b320b6ca67f74a5492ffd80020 100644 (file)
@@ -1041,7 +1041,8 @@ void BM_edges_sharp_from_angle_set(BMesh *bm, const float split_angle)
        bm_mesh_edges_sharp_tag(bm, NULL, NULL, NULL, split_angle, true);
 }
 
-static void UNUSED_FUNCTION(bm_mdisps_space_set)(Object *ob, BMesh *bm, int from, int to)
+static void UNUSED_FUNCTION(bm_mdisps_space_set)(
+        Object *ob, BMesh *bm, int from, int to, eObjectMode object_mode)
 {
        /* switch multires data out of tangent space */
        if (CustomData_has_layer(&bm->ldata, CD_MDISPS)) {
@@ -1052,7 +1053,7 @@ static void UNUSED_FUNCTION(bm_mdisps_space_set)(Object *ob, BMesh *bm, int from
                BMIter iter;
                // int i = 0; // UNUSED
                
-               multires_set_space(dm, ob, from, to);
+               multires_set_space(dm, ob, from, to, object_mode);
                
                mdisps = CustomData_get_layer(&dm->loopData, CD_MDISPS);