[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45256] trunk/blender/source/blender: converting a mesh to an undo mesh now skips using bmesh operator.
Campbell Barton
ideasman42 at gmail.com
Thu Mar 29 05:06:55 CEST 2012
Revision: 45256
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45256
Author: campbellbarton
Date: 2012-03-29 03:06:42 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
converting a mesh to an undo mesh now skips using bmesh operator.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
trunk/blender/source/blender/editors/object/object_edit.c
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-03-29 01:58:39 UTC (rev 45255)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-03-29 03:06:42 UTC (rev 45256)
@@ -136,7 +136,7 @@
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;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-03-29 01:58:39 UTC (rev 45255)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-03-29 03:06:42 UTC (rev 45256)
@@ -3083,8 +3083,8 @@
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;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_utils.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2012-03-29 01:58:39 UTC (rev 45255)
+++ trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2012-03-29 03:06:42 UTC (rev 45256)
@@ -532,7 +532,8 @@
/* 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;
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2012-03-29 01:58:39 UTC (rev 45255)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2012-03-29 03:06:42 UTC (rev 45256)
@@ -448,6 +448,8 @@
em = BMEdit_FromObject(ob);
if (LIKELY(em)) {
+ /* order doesn't matter */
+ EDBM_mesh_normals_update(em);
BMEdit_RecalcTessellation(em);
}
More information about the Bf-blender-cvs
mailing list