[Bf-blender-cvs] [8662cdd] soc-2014-fluid: Fix (one) compile error on MSVC 2013 Fix merge error

[Daniel Genrich]

Commit: 8662cddce177a872d00114184e3cbc92677760fb
Author: Daniel Genrich
Date:   Thu Oct 23 15:24:24 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB8662cddce177a872d00114184e3cbc92677760fb

Fix (one) compile error on MSVC 2013
Fix merge error

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

M	intern/smoke/intern/MANTA.cpp
M	source/blender/editors/physics/physics_fluid.c

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

diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index b73608e..4db5536 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -268,7 +268,7 @@ void Manta_API::add_mesh_transform_method(stringstream& ss)
 void Manta_API::manta_cache_path(char *filepath)
 {
 	char *name="manta";
-	BLI_make_file_string("/", filepath, BLI_temporary_dir(), name);
+	BLI_make_file_string("/", filepath, BLI_temp_dir_session(), name);
 }
 
 //void BLI_dir_create_recursive(const char *filepath);
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index fb224da..6f14f62 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -54,6 +54,7 @@
 #include "BKE_object.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
+#include "BKE_smoke.h"
 
 #include "LBM_fluidsim.h"