[Bf-blender-cvs] [79f7f4d] soc-2014-fluid: after-merge errors fixed

[Roman Pogribnyi]

Commit: 79f7f4d5626b322aa035c760cb6890c6c28b777d
Author: Roman Pogribnyi
Date:   Sun Mar 15 23:05:11 2015 +0100
Branches: soc-2014-fluid
https://developer.blender.org/rB79f7f4d5626b322aa035c760cb6890c6c28b777d

after-merge errors fixed

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

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 6772fb4..b95626a 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -257,12 +257,6 @@ void Manta_API::add_mesh_transform_method(stringstream& ss)
 	"  obj.offset(gs/2)\n\n";
 }
 
-void Manta_API::manta_cache_path(char *filepath)
-{
-	char *name="manta";
-	BLI_make_file_string("/", filepath, BLI_temp_dir_session(), name);
-}
-
 void Manta_API::stop_manta_sim()
 {
 	pthread_cancel(manta_thread);
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 7b3c84f..66bb63c 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -210,7 +210,7 @@ void smoke_reallocate_highres_fluid(SmokeDomainSettings *sds, float dx, int res[
 	/* smoke_turbulence_init uses non-threadsafe functions from fftw3 lib (like fftw_plan & co). */
 	BLI_lock_thread(LOCK_FFTW);
 
-	sds->wt = smoke_turbulence_init(res, sds->amplify + 1, sds->noise, BKE_tempdir_session(), use_fire, use_colors);
+	sds->wt = smoke_turbulence_init(res, sds->amplify + 1, sds->noise, BKE_tempdir_session(), use_fire, use_colors, sds);
 
 	BLI_unlock_thread(LOCK_FFTW);
 
@@ -578,7 +578,7 @@ void smokeModifier_createType(struct SmokeModifierData *smd)
 			smd->domain->noise_val_scale = 0.;
 			smd->domain->noise_val_offset = 0.075;
 			smd->domain->noise_time_anim = 0.2;
-			BLI_make_file_string("/", smd->domain->_manta_filepath, BLI_temp_dir_base(), "manta_scene.py");
+			BLI_make_file_string("/", smd->domain->_manta_filepath, BKE_tempdir_base(), "manta_scene.py");
 		}
 		else if (smd->type & MOD_SMOKE_TYPE_FLOW)
 		{