[Bf-blender-cvs] [d127b44] fluid-mantaflow: clean up in elbeem fluid code: removed some early tests (not needed since manta liquids are in smoke modifier)

[Sebastián Barschkis]

Commit: d127b440362deb22189a93eb0b44a52d2e65d9f1
Author: Sebastián Barschkis
Date:   Sat Jun 18 13:04:38 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBd127b440362deb22189a93eb0b44a52d2e65d9f1

clean up in elbeem fluid code: removed some early tests (not needed since manta liquids are in smoke modifier)

===================================================================

M	source/blender/editors/physics/physics_fluid.c

===================================================================

diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index fb6c22b..66eb9cf 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -850,7 +850,6 @@ static void fluidsim_delete_until_lastframe(FluidsimSettings *fss, const char *r
 	return;
 }
 
-#ifndef WITH_MANTA
 static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, short do_job)
 {
 	Scene *scene= CTX_data_scene(C);
@@ -1086,19 +1085,6 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor
 	// elbeemFree();
 	return 1;
 }
-#else /* WITH_MANTA */
-static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, short do_job)
-{
-//	Scene *scene= CTX_data_scene(C);
-//	int currentFrame = scene->r.cfra;
-	
-	struct LIQUID *liquid = liquid_init();
-	for (int i = 0; i < 100; ++i)
-		liquid_step(liquid, i);
-
-	return 1;
-}
-#endif /* WITH_MANTA */
 
 static void UNUSED_FUNCTION(fluidsimFreeBake)(Object *UNUSED(ob))
 {