diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-07-25 22:57:16 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-07-25 22:57:16 +0400 |
| commit | d7fecc9e963d8823d3e6a045c96d3a166ac031a6 (patch) | |
| tree | 80f91447a2112454b2651d12fbf2bedada2d9076 /source/blender/blenkernel/intern/object.c | |
| parent | 9bf0bfcae74f27e5bc2d5b20a70b21c3668542e4 (diff) | |
Fluid control: WIP commit before weekend, not working is crashing on the first 3 frames
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 7b36e46d45e..08845fb1a53 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -267,7 +267,6 @@ void free_object(Object *ob) MEM_freeN(ob->pd); } if(ob->soft) sbFree(ob->soft); - if(ob->fluidsimSettings) fluidsimSettingsFree(ob->fluidsimSettings); } static void unlink_object__unlinkModifierLinks(void *userData, Object *ob, Object **obpoin) @@ -1208,15 +1207,6 @@ Object *copy_object(Object *ob) } obn->soft= copy_softbody(ob->soft); - /* NT copy fluid sim setting memory */ - if(obn->fluidsimSettings) { - obn->fluidsimSettings = fluidsimSettingsCopy(ob->fluidsimSettings); - /* copying might fail... */ - if(obn->fluidsimSettings) { - obn->fluidsimSettings->orgMesh = (Mesh *)obn->data; - } - } - copy_object_particlesystems(obn, ob); obn->derivedDeform = NULL; |