- modified patch #4681, for scons compiling

  of the fluidsim can now be disabled with the
	flag: BF_NO_ELBEEM='true', e.g. for irix systems.
	(The number of ifdefs from the original
	patch was reduced, and the defines are now
	only necessary when elbeem is switched off.)
- particle generation option is available again

1 files changed, 27 insertions, 1 deletions

diff --git a/source/blender/src/fluidsim.c b/source/blender/src/fluidsim.c
index f88a6615143..c555aea654e 100644
--- a/source/blender/src/fluidsim.c
+++ b/source/blender/src/fluidsim.c
@@ -71,7 +71,7 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_ipo.h"
 #include "LBM_fluidsim.h"
-// TODO FIXME double elbeem.h in intern/extern...
+// warning - double elbeem.h in intern/extern...
 #include "elbeem.h"
 
 #include "BLI_editVert.h"
@@ -140,6 +140,11 @@ typedef struct {
 } fluidsimDerivedMesh;
 
 
+
+/* enable/disable overall compilation */
+#ifndef DISABLE_ELBEEM
+
+
 /* ********************** fluid sim settings struct functions ********************** */
 
 /* allocates and initializes general main data */
@@ -1399,3 +1404,24 @@ void fluidsimBake(struct Object *ob)
 }
 
 
+#else /* DISABLE_ELBEEM */
+
+/* compile dummy functions for disabled fluid sim */
+
+FluidsimSettings *fluidsimSettingsNew(struct Object *srcob) {
+	return NULL;
+}
+
+void fluidsimSettingsFree(FluidsimSettings *fss) {
+}
+
+FluidsimSettings* fluidsimSettingsCopy(FluidsimSettings *fss) {
+	return NULL;
+}
+
+/* only compile dummy functions */
+void fluidsimBake(struct Object *ob) {
+}
+
+#endif /* DISABLE_ELBEEM */
+