diff options
Diffstat (limited to 'source/blender/src/editmesh.c')
| -rw-r--r-- | source/blender/src/editmesh.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c index 188f7476728..25e7c50b07e 100644 --- a/source/blender/src/editmesh.c +++ b/source/blender/src/editmesh.c @@ -1342,7 +1342,7 @@ void load_editMesh(void) { Object *ob; ModifierData *md; - EditVert *eve, **vertMap = NULL; + EditVert **vertMap = NULL; int i,j; for (ob=G.main->object.first; ob; ob=ob->id.next) { @@ -1601,15 +1601,6 @@ void separate_mesh(void) return; } - /* blender crashes in derivedmesh drawing if I don't do this... but why? - Anyhoo, this function is horrible anyway (ton) - the fluidsimFlag also has to be reset btw. (n_t) */ - if(G.obedit->fluidsimSettings) { - fluidsimSettingsFree(G.obedit->fluidsimSettings); - G.obedit->fluidsimSettings = NULL; - G.obedit->fluidsimFlag = 0; - } - if(em->selected.first) BLI_freelistN(&(em->selected)); /* clear the selection order */ EM_selectmode_set(); // enforce full consistant selection flags @@ -1683,6 +1674,10 @@ void separate_mesh(void) efa= em->faces.first; while(efa) { vl1= efa->next; + if (efa == G.editMesh->act_face && (efa->f & SELECT)) { + EM_set_actFace(NULL); + } + if((efa->f & SELECT)==0) { BLI_remlink(&em->faces, efa); BLI_addtail(&edvl, efa); @@ -1782,13 +1777,6 @@ void separate_mesh_loose(void) error("Can't separate a mesh with vertex keys"); return; } - - /* same problem as in separate_mesh above (n_t) */ - if(G.obedit->fluidsimSettings) { - fluidsimSettingsFree(G.obedit->fluidsimSettings); - G.obedit->fluidsimSettings = NULL; - G.obedit->fluidsimFlag = 0; - } TEST_EDITMESH if(multires_test()) return; |