*FAULTY* code, big commit: manta files, Cmake and Scons integration. Started work on full-cycle fluids

6 files changed, 31 insertions, 1 deletions

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 0caf7d11c55..289f7f5e433 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -53,6 +53,7 @@ set(INC
 set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 	${ZLIB_INCLUDE_DIRS}
+	${PYTHON_INCLUDE_DIRS}
 )
 
 set(SRC
@@ -384,6 +385,13 @@ if(WITH_MOD_SMOKE)
 	add_definitions(-DWITH_SMOKE)
 endif()
 
+if(WITH_MOD_MANTA)
+	list(APPEND INC
+		../../../extern/manta_pp
+	)
+	add_definitions(-DWITH_MANTA)
+endif()
+
 if(WITH_MOD_OCEANSIM)
 	add_definitions(-DWITH_OCEANSIM)
 endif()
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 25f8422afed..26598c70755 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -50,6 +50,7 @@ incs = [
     '#/intern/elbeem/extern',
     '#/intern/iksolver/extern',
     '#/intern/smoke/extern',
+    '#/extern/manta_pp',
     '#/intern/atomic',
     '../avi',
     '../blenfont',
@@ -76,6 +77,9 @@ defs = [
 
 if env['WITH_BF_SMOKE']:
     defs.append('WITH_SMOKE')
+    
+if env['WITH_BF_MANTA']:
+    defs.append('WITH_MANTA')
 
 if env['WITH_BF_FRAMESERVER']:
     defs.append('WITH_FRAMESERVER')
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 36babcb49b6..8d0a5e0fbb4 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2693,7 +2693,13 @@ static void smokeModifier_process(SmokeModifierData *smd, Scene *scene, Object *
 			printf("bad smokeModifier_init\n");
 			return;
 		}
-
+		if(smd->domain->flags & MOD_SMOKE_USE_MANTA)
+		{
+			char buff[100];
+			sprintf(buff, "./den%04d.uni", scene->r.cfra);
+			smoke_mantaflow_read(smd->domain->fluid, buff);
+			return;
+		}
 		/* try to read from cache */
 		if (BKE_ptcache_read(&pid, (float)framenr) == PTCACHE_READ_EXACT) {
 			BKE_ptcache_validate(cache, framenr);
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index ff75d9a1721..c2d5a9822ba 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -61,6 +61,7 @@ incs = [
     '#/intern/audaspace/intern',
     '#/intern/cycles/blender',
     '#/intern/smoke/extern',
+    '#/extern/manta_pp',
     '../../blenfont',
     '../../blenkernel',
     '../../blenlib',
@@ -78,6 +79,9 @@ incs = ' '.join(incs)
 if env['WITH_BF_SMOKE']:
     defs.append('WITH_SMOKE')
 
+if env['WITH_BF_MANTA']:
+    defs.append('WITH_MANTA')
+
 if env['WITH_BF_BULLET']:
     defs.append('WITH_BULLET')
     incs += ' #/intern/rigidbody'
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index a5b52a3dd63..f3b02c32093 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -36,6 +36,7 @@ incs = [
     '#/extern/glew/include',
     '#/intern/audaspace/intern',
     '#/intern/cycles/blender',
+    '#/extern/manta_pp',
     '../blenfont',
     '../blenkernel',
     '../blenlib',
@@ -180,6 +181,9 @@ if env['WITH_BF_REMESH']:
 if env['WITH_BF_SMOKE']:
     defs.append('WITH_SMOKE')
 
+if env['WITH_BF_MANTA']:
+    defs.append('WITH_MANTA')
+
 if env['WITH_BF_COLLADA']:
     defs.append('WITH_COLLADA')
 
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 0605f408348..48877944563 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -239,6 +239,10 @@ if(WITH_MOD_SMOKE)
 	add_definitions(-DWITH_SMOKE)
 endif()
 
+if(WITH_MOD_MANTA)
+	add_definitions(-DWITH_MANTA)
+endif()
+
 if(WITH_OPENCOLLADA)
 	add_definitions(-DWITH_COLLADA)
 endif()