diff options
| author | Nils Thuerey <nils@thuerey.de> | 2007-04-03 23:56:57 +0400 |
|---|---|---|
| committer | Nils Thuerey <nils@thuerey.de> | 2007-04-03 23:56:57 +0400 |
| commit | d0bd8de9726644264aa4fb28b190a428f8bcabf9 (patch) | |
| tree | 5b2e10fc8d182d9366541b8cdb372349601c4565 /source/blender/src/editmesh.c | |
| parent | 9d079a2c2e7f38214e1fdff5b6b0d44dd1e7e731 (diff) | |
Fixed bug #6068 (fluids & separate vertices)
* Also reset the fluidsimFlag to zero.
The fluidsim settings are now disabled before duplicating the mesh
for separate_mesh and separate_mesh_loose.
Diffstat (limited to 'source/blender/src/editmesh.c')
| -rw-r--r-- | source/blender/src/editmesh.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c index 41597b4fac6..bcb0d80d720 100644 --- a/source/blender/src/editmesh.c +++ b/source/blender/src/editmesh.c @@ -1419,6 +1419,15 @@ 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 @@ -1524,13 +1533,6 @@ void separate_mesh(void) G.obedit= BASACT->object; /* basact was set in adduplicate() */ - /* blender crashes in derivedmesh drawing if I don't do this... but why? - Anyhoo, this function is horrible anyway (ton) */ - if(G.obedit->fluidsimSettings) { - fluidsimSettingsFree(G.obedit->fluidsimSettings); - G.obedit->fluidsimSettings= NULL; - } - men= copy_mesh(me); set_mesh(G.obedit, men); /* because new mesh is a copy: reduce user count */ @@ -1599,6 +1601,13 @@ void separate_mesh_loose(void) 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; waitcursor(1); |