svn merge -r 16320:16369 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / src / editmesh.c
index b75f7e07143c0bd4fc42fc1487813acdd724f724..4c5afe0e6bc1edaeff1b61a649fc4cf780fc6b87 100644 (file)
@@ -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 
@@ -1786,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;