[Bf-blender-cvs] [818d6ae] soc-2014-fluid: more fluid_3d pointers handling

[Roman Pogribnyi]

Commit: 818d6ae380193bf21e26d1f0966cc7488c691cf0
Author: Roman Pogribnyi
Date:   Fri Aug 8 23:46:11 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB818d6ae380193bf21e26d1f0966cc7488c691cf0

more fluid_3d pointers handling

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

M	intern/smoke/intern/smoke_API.cpp

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

diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp
index 9e0e057..722540e 100644
--- a/intern/smoke/intern/smoke_API.cpp
+++ b/intern/smoke/intern/smoke_API.cpp
@@ -529,15 +529,14 @@ 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);
-	FLUID_3D *fluid = smd->domain->fluid;
 	/*'Y' and 'Z' axes are mixed in mantaflow and Blender*/
-	int size_x = fluid->xRes();
-	int size_y = fluid->zRes();
-	int size_z = fluid->yRes();
+	int size_x = smd->domain->fluid->xRes();
+	int size_y = smd->domain->fluid->zRes();
+	int size_z = smd->domain->fluid->yRes();
 	
-	float *force_x = smoke_get_force_x(fluid);
-	float *force_y = smoke_get_force_z(fluid);
-	float *force_z = smoke_get_force_y(fluid);
+	float *force_x = smoke_get_force_x(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);
 }