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 0abd758460c..d6e451a8625 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -1101,7 +1101,7 @@ void load_editMesh(Scene *scene, Object *obedit) int j; for (ob=G.main->object.first; ob; ob=ob->id.next) { - if (ob->parent==ob && ELEM(ob->partype, PARVERT1,PARVERT3)) { + if (ob->parent==obedit && ELEM(ob->partype, PARVERT1,PARVERT3)) { /* duplicate code from below, make it function later...? */ if (!vertMap) { @@ -1661,8 +1661,8 @@ static void *editMesh_to_undoMesh(void *emv) /* now copy vertices */ a = 0; for(eve=em->verts.first; eve; eve= eve->next, evec++, a++) { - VECCOPY(evec->co, eve->co); - VECCOPY(evec->no, eve->no); + copy_v3_v3(evec->co, eve->co); + copy_v3_v3(evec->no, eve->no); evec->f= eve->f; evec->h= eve->h; @@ -1763,7 +1763,7 @@ static void undoMesh_to_editMesh(void *umv, void *emv) eve= addvertlist(em, evec->co, NULL); evar[a]= eve; - VECCOPY(eve->no, evec->no); + copy_v3_v3(eve->no, evec->no); eve->f= evec->f; eve->h= evec->h; eve->keyindex= evec->keyindex; |