diff options
author | Ton Roosendaal <ton@blender.org> | 2007-01-11 17:08:45 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2007-01-11 17:08:45 +0300 |
commit | 35295636839755767c8d4d5cdfe1fe4a10c6523a (patch) | |
tree | 69654369c366b2f0852afd08f90ffedd23286207 /source/blender/src/editmesh.c | |
parent | a3e0a028cdf2f4e4977627026adb4bc6eb60a50d (diff) |
Bugfix #5681
Mesh editmode; "Separate" tool crashed when Object had fluidsettings.
Diffstat (limited to 'source/blender/src/editmesh.c')
-rw-r--r-- | source/blender/src/editmesh.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c index b43e57a21d3..3dd4539febc 100644 --- a/source/blender/src/editmesh.c +++ b/source/blender/src/editmesh.c @@ -1503,7 +1503,8 @@ void separate_mesh(void) G.obedit->vnode = NULL; } #endif - adduplicate(1, 0); /* notrans and a linked duplicate*/ + adduplicate(1, 0); /* notrans and a linked duplicate */ + #ifdef WITH_VERSE if(vnode) { G.obedit->vnode = vnode; @@ -1511,7 +1512,14 @@ void separate_mesh(void) #endif 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 */ |