[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50493] trunk/blender/source/blender: fix [#32518] Vertex slide crash sometimes.
Campbell Barton
ideasman42 at gmail.com
Mon Sep 10 05:42:30 CEST 2012
Revision: 50493
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50493
Author: campbellbarton
Date: 2012-09-10 03:42:29 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
fix [#32518] Vertex slide crash sometimes.
Undo would leave BMEditMesh->me pointer NULL, this would likely crash EDBM_verts_mirror_cache_begin() too.
Rather then restore 'me', remove the pointer altogether and use BMEditMesh->ob->data to save us having to keep track of 2 pointers.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_tessmesh.h
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/editors/mesh/editmesh_slide.c
trunk/blender/source/blender/editors/mesh/editmesh_utils.c
Modified: trunk/blender/source/blender/blenkernel/BKE_tessmesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_tessmesh.h 2012-09-10 03:34:43 UTC (rev 50492)
+++ trunk/blender/source/blender/blenkernel/BKE_tessmesh.h 2012-09-10 03:42:29 UTC (rev 50493)
@@ -72,10 +72,12 @@
short selectmode;
short mat_nr;
- /*Mesh structure this editmesh came from, if it came from one*/
- struct Mesh *me;
+ /* Object this editmesh came from (if it came from one) */
struct Object *ob;
+ /* Unused for now, we could bring it back and assign in the same way 'ob' is */
+ // struct Mesh *me;
+
/*temp variables for x-mirror editing*/
int mirror_cdlayer; /* -1 is invalid */
int mirr_free_arrays;
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-09-10 03:34:43 UTC (rev 50492)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-09-10 03:42:29 UTC (rev 50493)
@@ -1747,10 +1747,11 @@
BMEditMesh *BMEdit_FromObject(Object *ob)
{
BLI_assert(ob->type == OB_MESH);
+ /* sanity check */
#ifndef NDEBUG
-// if (((Mesh *)ob->data)->edit_btmesh) {
-// BLI_assert(((Mesh *)ob->data)->edit_btmesh->me == ob->data);
-// }
+ if (((Mesh *)ob->data)->edit_btmesh) {
+ BLI_assert(((Mesh *)ob->data)->edit_btmesh->ob == ob);
+ }
#endif
return ((Mesh *)ob->data)->edit_btmesh;
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_slide.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_slide.c 2012-09-10 03:34:43 UTC (rev 50492)
+++ trunk/blender/source/blender/editors/mesh/editmesh_slide.c 2012-09-10 03:42:29 UTC (rev 50493)
@@ -208,7 +208,7 @@
other = BM_edge_other_vert(vso->sel_edge, vso->start_vtx);
}
- if (em->me->editflag & ME_EDIT_MIRROR_X) {
+ if (((Mesh *)em->ob->data)->editflag & ME_EDIT_MIRROR_X) {
EDBM_verts_mirror_cache_begin(em, TRUE);
mirr_vtx = EDBM_verts_mirror_get(em, vso->start_vtx);
@@ -255,7 +255,7 @@
BM_select_history_store(em->bm, vso->start_vtx);
}
- if (em->me->editflag & ME_EDIT_MIRROR_X) {
+ if (((Mesh *)em->ob->data)->editflag & ME_EDIT_MIRROR_X) {
EDBM_verts_mirror_cache_end(em);
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_utils.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2012-09-10 03:34:43 UTC (rev 50492)
+++ trunk/blender/source/blender/editors/mesh/editmesh_utils.c 2012-09-10 03:42:29 UTC (rev 50493)
@@ -345,7 +345,6 @@
me->edit_btmesh->selectmode = me->edit_btmesh->bm->selectmode = ts->selectmode;
me->edit_btmesh->mat_nr = (ob->actcol > 0) ? ob->actcol - 1 : 0;
- me->edit_btmesh->me = me;
me->edit_btmesh->ob = ob;
}
@@ -1056,7 +1055,7 @@
#define BM_CD_LAYER_ID "__mirror_index"
void EDBM_verts_mirror_cache_begin(BMEditMesh *em, const short use_select)
{
- Mesh *me = em->me;
+ Mesh *me = (Mesh *)em->ob->data;
BMesh *bm = em->bm;
BMIter iter;
BMVert *v;
More information about the Bf-blender-cvs
mailing list