diff options
Diffstat (limited to 'source/blender/editors/mesh/editmesh.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index 424b3c5467f..99b3d4e64ab 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -918,9 +918,9 @@ void make_editMesh(Scene *scene, Object *ob) } /* makes Mesh out of editmesh */ -void load_editMesh(Scene *scene, Object *ob) +void load_editMesh(Scene *scene, Object *obedit) { - Mesh *me= ob->data; + Mesh *me= obedit->data; MVert *mvert, *oldverts; MEdge *medge; MFace *mface; @@ -1110,7 +1110,7 @@ void load_editMesh(Scene *scene, Object *ob) Object *ob; ModifierData *md; EditVert **vertMap = NULL; - int i,j; + int j; for (ob=G.main->object.first; ob; ob=ob->id.next) { if (ob->parent==ob && ELEM(ob->partype, PARVERT1,PARVERT3)) { @@ -1310,7 +1310,7 @@ void load_editMesh(Scene *scene, Object *ob) mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL); /* topology could be changed, ensure mdisps are ok */ - multires_topology_changed(ob); + multires_topology_changed(obedit); } void remake_editMesh(Scene *scene, Object *ob) |