diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-21 22:36:25 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-21 22:36:25 +0400 |
| commit | a1b8a918cbf7eabc1719bd0146f67a342615de57 (patch) | |
| tree | 1cb67f68550da17b3ca89d0a6f34fbd5f3da7aec | |
| parent | 8471184dc5a726903329bc37040e051e9ec0f5d4 (diff) | |
Respect compile flags if elbeem is disabled, fix compiling for that case
| -rw-r--r-- | source/blender/blenkernel/intern/fluidsim.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index 4c00dc1e918..9c1b3ee5a8d 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -59,8 +59,6 @@ /* ************************* fluidsim bobj file handling **************************** */ -#ifndef DISABLE_ELBEEM - // ----------------------------------------- // forward decleration // ----------------------------------------- @@ -69,6 +67,7 @@ void fluidsim_init(FluidsimModifierData *fluidmd) { +#ifndef DISABLE_ELBEEM if(fluidmd) { FluidsimSettings *fss = MEM_callocN(sizeof(FluidsimSettings), "fluidsimsettings"); @@ -145,22 +144,24 @@ void fluidsim_init(FluidsimModifierData *fluidmd) fss->flag = 0; } - +#endif return; } void fluidsim_free(FluidsimModifierData *fluidmd) { +#ifndef DISABLE_ELBEEM if(fluidmd) { MEM_freeN(fluidmd->fss); } - +#endif return; } DerivedMesh *fluidsimModifier_do(FluidsimModifierData *fluidmd, Object *ob, DerivedMesh *dm, int useRenderParams, int isFinalCalc) { +#ifndef DISABLE_ELBEEM DerivedMesh *result = NULL; int framenr; FluidsimSettings *fss = NULL; @@ -223,8 +224,12 @@ DerivedMesh *fluidsimModifier_do(FluidsimModifierData *fluidmd, Object *ob, Deri } return dm; +#else + return NULL; +#endif } +#ifndef DISABLE_ELBEEM /* read .bobj.gz file into a fluidsimDerivedMesh struct */ static DerivedMesh *fluidsim_read_obj(char *filename) { |