diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-07-18 17:05:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-07-18 17:05:15 +0400 |
| commit | 6786c517af25234de320fc459252390e4454d85f (patch) | |
| tree | 2ab710e8a767fd18004693e99017e1449ca48be9 /source/blender/src/editmesh.c | |
| parent | c216c980d3494b3a7884bc2d0d033002a2e2d0cb (diff) | |
own error, recent commit that tried to keep an active face could crash when deleting faces.
Diffstat (limited to 'source/blender/src/editmesh.c')
| -rw-r--r-- | source/blender/src/editmesh.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c index 2b12b16a299..188f7476728 100644 --- a/source/blender/src/editmesh.c +++ b/source/blender/src/editmesh.c @@ -340,8 +340,9 @@ void free_editface(EditFace *efa) #endif EM_remove_selection(efa, EDITFACE); - if (G.editMesh->act_face==efa) - EM_set_actFace(NULL); + if (G.editMesh->act_face==efa) { + EM_set_actFace( G.editMesh->faces.first == efa ? NULL : G.editMesh->faces.first); + } CustomData_em_free_block(&G.editMesh->fdata, &efa->data); if(efa->fast==0) @@ -1061,7 +1062,7 @@ void make_editMesh() EM_fgon_flags(); if (EM_get_actFace(0)==NULL) { - EM_set_actFace(NULL); /* will use the first face, this is so we alwats have an active face */ + EM_set_actFace( G.editMesh->faces.first ); /* will use the first face, this is so we alwats have an active face */ } /* vertex coordinates change with cache edit, need to recalc */ |