[Bf-blender-cvs] [00c9e3b] soc-2014-fluid: rotating domain to get manta axes

[Roman Pogribnyi]

Commit: 00c9e3b4cfa3b45306340ed049ef5f0ed1fec460
Author: Roman Pogribnyi
Date:   Tue Aug 12 22:43:39 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB00c9e3b4cfa3b45306340ed049ef5f0ed1fec460

rotating domain to get manta axes

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

M	intern/smoke/intern/MANTA.cpp
M	intern/smoke/intern/smoke_API.cpp

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

diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index 4312f4e..4021917 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -324,7 +324,7 @@ void generate_manta_sim_file(Scene *scene, SmokeModifierData *smd)
 	/*Solver Resolution*/
 	ss << "res = " << smd->domain->maxres << " \n";
 	/*Z axis in Blender = Y axis in Mantaflow*/
-	manta_create_solver(ss, "s", "main", "gs", smd->domain->fluid->xRes(), smd->domain->fluid->zRes(), smd->domain->fluid->yRes(), smd->domain->manta_solver_res);
+	manta_create_solver(ss, "s", "main", "gs", smd->domain->base_res[0], smd->domain->base_res[2], smd->domain->base_res[1], smd->domain->manta_solver_res);
 	ss << "s.timestep = " << smd->domain->time_scale << " \n";
 	
 	/*Noise Field*/
diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp
index 5cce068..5dd4e7a 100644
--- a/intern/smoke/intern/smoke_API.cpp
+++ b/intern/smoke/intern/smoke_API.cpp
@@ -530,12 +530,12 @@ extern "C" void manta_write_effectors(struct Scene *s, struct SmokeModifierData
 	assert(smd->domain->manta_obj != NULL);
 	manta_update_effectors(s, smd->domain->manta_obj, smd->domain, 0.1f);
 	int size_x = smd->domain->fluid->xRes();
-	int size_y = smd->domain->fluid->yRes();
-	int size_z = smd->domain->fluid->zRes();
+	int size_y = smd->domain->fluid->zRes();
+	int size_z = smd->domain->fluid->yRes();
 	
 	float *force_x = smoke_get_force_x(smd->domain->fluid);
-	float *force_y = smoke_get_force_y(smd->domain->fluid);
-	float *force_z = smoke_get_force_z(smd->domain->fluid);
+	float *force_y = smoke_get_force_z(smd->domain->fluid);
+	float *force_z = smoke_get_force_y(smd->domain->fluid);
 	export_force_fields(size_x, size_y, size_z, force_x, force_y, force_z);
 }