[Bf-blender-cvs] [c9a3db6] soc-2014-fluid: reverting to Bake button

[Roman Pogribnyi]

Commit: c9a3db6c4211a64493019b347728c7edbdab2d04
Author: Roman Pogribnyi
Date:   Mon Aug 18 16:49:01 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rBc9a3db6c4211a64493019b347728c7edbdab2d04

reverting to Bake button

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

M	intern/smoke/intern/MANTA.cpp
M	source/blender/blenkernel/intern/smoke.c

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

diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index d4fa3b7..3bead37 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -293,36 +293,36 @@ void *run_manta_scene_thread(void *arguments)
 
 void run_manta_scene(Scene *s, SmokeModifierData *smd)
 {
-	smd->domain->manta_sim_frame = 0;
-	PyGILState_STATE gilstate = PyGILState_Ensure();
-//	for (int fr=0; fr< 1; ++fr)
-	int fr = s->r.cfra;
-	{
-//		if(smd->domain->manta_sim_frame == -1)
-//			break;
-		printf("Simulation Step");
-		manta_write_effectors(s, smd);
-		smd->domain->manta_sim_frame = fr;
-		std::string frame_str = static_cast<ostringstream*>( &(ostringstream() << fr) )->str();
-		std::string py_string_0 = string("sim_step(").append(frame_str);
-		std::string py_string_1 = py_string_0.append(")\0");
-		//		std::string py_string_1 = string("sim_step()\0");
-		PyRun_SimpleString(py_string_1.c_str());
-		//		frame_num ++;
-	}
-	PyGILState_Release(gilstate);
+//	smd->domain->manta_sim_frame = 0;
+//	PyGILState_STATE gilstate = PyGILState_Ensure();
+////	for (int fr=0; fr< 1; ++fr)
+//	int fr = s->r.cfra;
+//	{
+////		if(smd->domain->manta_sim_frame == -1)
+////			break;
+//		printf("Simulation Step");
+//		manta_write_effectors(s, smd);
+//		smd->domain->manta_sim_frame = fr;
+//		std::string frame_str = static_cast<ostringstream*>( &(ostringstream() << fr) )->str();
+//		std::string py_string_0 = string("sim_step(").append(frame_str);
+//		std::string py_string_1 = py_string_0.append(")\0");
+//		//		std::string py_string_1 = string("sim_step()\0");
+//		PyRun_SimpleString(py_string_1.c_str());
+//		//		frame_num ++;
+//	}
+//	PyGILState_Release(gilstate);
 	//returning simulation state to "not simulating" aka -1
 //	smd->domain->manta_sim_frame = -1;
 //
 //	
 //	
-//	struct manta_arg_struct *args = (struct manta_arg_struct*)malloc(sizeof(struct manta_arg_struct));
-//	args->smd = *smd;
-//	args->s = *s;
-////	args.frame_num = smd->domain->manta_end_frame - smd->domain->manta_start_frame;
-//	int rc = pthread_create(&manta_thread, NULL, run_manta_sim_thread, (void *)args);
-////	pthread_join(manta_thread,NULL);
-////	pthread_detach(manta_thread);
+	struct manta_arg_struct *args = (struct manta_arg_struct*)malloc(sizeof(struct manta_arg_struct));
+	args->smd = *smd;
+	args->s = *s;
+//	args.frame_num = smd->domain->manta_end_frame - smd->domain->manta_start_frame;
+	int rc = pthread_create(&manta_thread, NULL, run_manta_sim_thread, (void *)args);
+//	pthread_join(manta_thread,NULL);
+//	pthread_detach(manta_thread);
 }
 
 void stop_manta_sim()
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index fb91202..c812b35 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2800,7 +2800,8 @@ static void smokeModifier_process(SmokeModifierData *smd, Scene *scene, Object *
 		// DG: interesting commenting this line + deactivating loading of noise files
 		if(framenr != startframe && smd->domain->flags & MOD_SMOKE_USE_MANTA)	/*load manta sim data into fluid object*/
 		{
-			smoke_mantaflow_sim_step(scene,smd);
+			/*PR: Uncomment when adding simulation from timeline*/
+			/*smoke_mantaflow_sim_step(scene,smd);*/
 			const char *density_name_format = "./den%04d.uni";
 			const char *wavelets_name_format = "./densityXL_%04d.uni";
 			char buff[100];