archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fluid control: WIP commit before weekend, not working is crashing on the first 3 frames

Browse Source
This commit is contained in:
Daniel Genrich
2008-07-25 18:57:16 +00:00
parent 9bf0bfcae7
commit d7fecc9e96
29 changed files with 1600 additions and 1493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/object.c
View File

@@ -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;