sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- added fix for fluidsim copying bug

Browse Source 
(surface mesh structs werent handled correctly,
  copying is now done in a new function)
This commit is contained in:
Nils Thuerey 2006-06-12 06:18:57 +00:00
parent 9262cdbd0e
commit a0d94e6727
4 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/elbeem/extern/LBM_fluidsim.h vendored
View File

@ -48,6 +48,9 @@ struct FluidsimSettings* fluidsimSettingsNew(struct Object *srcob);
/* frees internal data itself */
void fluidsimSettingsFree(struct FluidsimSettings* sb);
/* duplicate internal data */
struct FluidsimSettings* fluidsimSettingsCopy(struct FluidsimSettings* sb);
/* export blender geometry to fluid solver */
void fluidsimBake(struct Object* ob);

2
source/blender/blenkernel/bad_level_call_stubs/stubs.c
View File

@ -60,6 +60,7 @@ void insert_vert_ipo(struct IpoCurve *icu, float x, float y);
struct IpoCurve *verify_ipocurve(struct ID *id, short a, char *b, char *d, int e);
void elbeemDebugOut(char *msg);
void fluidsimSettingsFree(struct FluidsimSettings* sb);
void fluidsimSettingsCopy(struct FluidsimSettings* sb);
/* readfile.c */
@ -224,6 +225,7 @@ struct DispListMesh *NewBooleanMeshDLM(struct Object *ob, struct Object *ob_sele
// bobj read/write debug messages
void elbeemDebugOut(char *msg) {}
void fluidsimSettingsFree(struct FluidsimSettings* sb) {}
void fluidsimSettingsCopy(struct FluidsimSettings* sb) {}
/*new render funcs */
void externtex(struct MTex *mtex, float *vec, float *tin, float *tr, float *tg, float *tb, float *ta) {}

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

@ -902,8 +902,9 @@ Object *copy_object(Object *ob)
obn->soft= copy_softbody(ob->soft);
/* NT copy fluid sim setting memory */
if(obn->fluidsimSettings) obn->fluidsimSettings = MEM_dupallocN(ob->fluidsimSettings);
else obn->fluidsimSettings = NULL;
//if(obn->fluidsimSettings) obn->fluidsimSettings = MEM_dupallocN(ob->fluidsimSettings);
//else obn->fluidsimSettings = NULL;
obn->fluidsimSettings = fluidsimSettingsCopy(ob->fluidsimSettings);
obn->derivedDeform = NULL;
obn->derivedFinal = NULL;

31
source/blender/src/fluidsim.c
View File

@ -208,6 +208,37 @@ FluidsimSettings *fluidsimSettingsNew(struct Object *srcob)
return fss;
}
/* duplicate struct, analogous to free */
FluidsimSettings* fluidsimSettingsCopy(FluidsimSettings *fss)
{
FluidsimSettings *dupfss;
Mesh *dupFsMesh = NULL;
if(!fss) return NULL;
dupfss = MEM_dupallocN(fss);
dupFsMesh = fss->meshSurface;
if(dupFsMesh) {
dupfss->meshSurface = MEM_dupallocN(dupFsMesh);
if(dupFsMesh->mvert) dupfss->meshSurface->mvert = MEM_dupallocN(dupFsMesh->mvert);
if(dupFsMesh->medge) dupfss->meshSurface->medge = MEM_dupallocN(dupFsMesh->medge);
if(dupFsMesh->mface) dupfss->meshSurface->mface = MEM_dupallocN(dupFsMesh->mface);
}
dupFsMesh = fss->meshBB;
if(dupFsMesh) {
dupfss->meshBB = MEM_dupallocN(dupFsMesh);
if(dupFsMesh->mvert) dupfss->meshBB->mvert = MEM_dupallocN(dupFsMesh->mvert);
if(dupFsMesh->medge) dupfss->meshBB->medge = MEM_dupallocN(dupFsMesh->medge);
if(dupFsMesh->mface) dupfss->meshBB->mface = MEM_dupallocN(dupFsMesh->mface);
}
if(fss->meshSurfNormals) dupfss->meshSurfNormals = MEM_dupallocN(fss->meshSurfNormals);
return dupfss;
}
/* free struct */
void fluidsimSettingsFree(FluidsimSettings *fss)
{