[Bf-blender-cvs] [264691e5630] blender2.8: Merge branch 'master' into blender2.8
Campbell Barton
noreply at git.blender.org
Mon Feb 19 07:44:14 CET 2018
Commit: 264691e5630fcd11516272c98bcdf2a2c980dfa3
Author: Campbell Barton
Date: Mon Feb 19 17:46:42 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB264691e5630fcd11516272c98bcdf2a2c980dfa3
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/scene.c
index 932f80c35d5,423ed2af057..899a911270f
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@@ -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);
}
}
}
diff --cc source/blender/editors/mesh/editmesh_tools.c
index ff1cd7224cd,c979a73e964..a71b03b6ff7
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@@ -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);
}
diff --cc source/blender/python/bmesh/bmesh_py_types.c
index 629c3a3c7a3,2866683b89b..ec787768a57
--- a/source/blender/python/bmesh/bmesh_py_types.c
+++ b/source/blender/python/bmesh/bmesh_py_types.c
@@@ -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 */
More information about the Bf-blender-cvs
mailing list