diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-21 22:20:02 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-21 22:20:02 +0400 |
| commit | 8471184dc5a726903329bc37040e051e9ec0f5d4 (patch) | |
| tree | 03312b48c93c5f2acb25e5280ce5a586244dd54e /source/blender/blenkernel/intern/object.c | |
| parent | afe851b6d194ad93f85a66ea5866a3709708089d (diff) | |
| parent | 518b8fe01834b6379614f65f7c611645e5ad4bd5 (diff) | |
Merging fluidcontrol to trunk from rev16649 fluidcontrol branch. Code provided by Nils Thuerey.
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 f9de9d58a37..5d352c1e11d 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -269,7 +269,6 @@ void free_object(Object *ob) MEM_freeN(ob->pd); } if(ob->soft) sbFree(ob->soft); - if(ob->fluidsimSettings) fluidsimSettingsFree(ob->fluidsimSettings); if(ob->gpulamp.first) GPU_lamp_free(ob); } @@ -1217,15 +1216,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; |