diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-29 07:06:42 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-29 07:06:42 +0400 |
| commit | a173508f493e27c6b746b00435f631a31d8419d8 (patch) | |
| tree | 5286eed72c76fa592c9f2b9b681e94f2d015636d /source | |
| parent | f22f60e7c4b57b28add3658eaa86b21041cad241 (diff) | |
converting a mesh to an undo mesh now skips using bmesh operator.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 7cc37da4b1d..04ad8276365 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -136,7 +136,7 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *tm) if ( (tm->looptris != NULL) && (tm->tottri != 0) && /* (totrti <= bm->totface * 2) would be fine for all quads, - * but in case there are some ngons, still re-use the array */ + * but in case there are some ngons, still re-use the array */ (tm->tottri <= bm->totface * 3)) { looptris = tm->looptris; diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 26bfcfbf0ac..29c1496b042 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3083,8 +3083,8 @@ static int mesh_separate_selected(Main *bmain, Scene *scene, Base *editbase, wmO EDBM_op_callf(em, wmop, "del geom=%hvef context=%i", BM_ELEM_SELECT, DEL_VERTS); BM_mesh_normals_update(bm_new, TRUE); - BMO_op_callf(bm_new, "bmesh_to_mesh mesh=%p object=%p notessellation=%b", - basenew->object->data, basenew->object, TRUE); + + BM_mesh_bm_to_me(bm_new, basenew->object->data, FALSE); BM_mesh_free(bm_new); ((Mesh *)basenew->object->data)->edit_btmesh = NULL; diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index b9a75729a8a..ff3415545eb 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -532,7 +532,8 @@ static void *editbtMesh_to_undoMesh(void *emv, void *obdata) /* BM_mesh_validate(em->bm); */ /* for troubleshooting */ - BMO_op_callf(em->bm, "bmesh_to_mesh mesh=%p notessellation=%b", &um->me, TRUE); + BM_mesh_bm_to_me(em->bm, &um->me, FALSE); + um->selectmode = em->selectmode; return um; diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 54207e0a598..b92f641584b 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -448,6 +448,8 @@ void ED_object_enter_editmode(bContext *C, int flag) em = BMEdit_FromObject(ob); if (LIKELY(em)) { + /* order doesn't matter */ + EDBM_mesh_normals_update(em); BMEdit_RecalcTessellation(em); } |