[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16653] trunk/blender/source/blender/ blenkernel/intern/fluidsim.c: Respect compile flags if elbeem is disabled, fix compiling for that case
Daniel Genrich
daniel.genrich at gmx.net
Sun Sep 21 20:36:26 CEST 2008
Revision: 16653
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16653
Author: genscher
Date: 2008-09-21 20:36:25 +0200 (Sun, 21 Sep 2008)
Log Message:
-----------
Respect compile flags if elbeem is disabled, fix compiling for that case
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/fluidsim.c
Modified: trunk/blender/source/blender/blenkernel/intern/fluidsim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fluidsim.c 2008-09-21 18:20:02 UTC (rev 16652)
+++ trunk/blender/source/blender/blenkernel/intern/fluidsim.c 2008-09-21 18:36:25 UTC (rev 16653)
@@ -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 @@
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 @@
}
return dm;
+#else
+ return NULL;
+#endif
}
+#ifndef DISABLE_ELBEEM
/* read .bobj.gz file into a fluidsimDerivedMesh struct */
static DerivedMesh *fluidsim_read_obj(char *filename)
{
More information about the Bf-blender-cvs
mailing list