Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2010-04-12 05:26:56 +0400
committerMatt Ebb <matt@mke3.net>2010-04-12 05:26:56 +0400
commit2b547dac8fcbb1a5a4ecc819a8d921e0c39b1e72 (patch)
treecd922085ad3392d55ff3a4fc13c0364a89aa26a6 /source/blender/modifiers/intern/MOD_fluidsim_util.c
parent8e4cbaa0c7dea891b0f9f3ae345abe78e521bf91 (diff)
Fix many compile errors in fluidsim modifier.
Please enable+compile before committing!
Diffstat (limited to 'source/blender/modifiers/intern/MOD_fluidsim_util.c')
-rw-r--r--source/blender/modifiers/intern/MOD_fluidsim_util.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c
index c2cb90fa76c..105ee919a4e 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim_util.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c
@@ -35,10 +35,23 @@
#include "math.h"
#include "float.h"
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BKE_cdderivedmesh.h"
#include "BKE_DerivedMesh.h"
+#include "BKE_global.h"
+#include "BKE_mesh.h"
+#include "BKE_utildefines.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
+#include "DNA_object_fluidsim.h"
#include "DNA_scene_types.h"
+#include "DNA_space_types.h" // FILE_MAX
#include "MOD_modifiertypes.h"
#include "MOD_fluidsim_util.h"
@@ -324,13 +337,13 @@ void fluid_get_bb(MVert *mvert, int totvert, float obmat[][4],
return;
}
- VECCOPY(vec, mvert[0].co);
+ copy_v3_v3(vec, mvert[0].co);
mul_m4_v3(obmat, vec);
bbsx = vec[0]; bbsy = vec[1]; bbsz = vec[2];
bbex = vec[0]; bbey = vec[1]; bbez = vec[2];
for(i = 1; i < totvert; i++) {
- VECCOPY(vec, mvert[i].co);
+ copy_v3_v3(vec, mvert[i].co);
mul_m4_v3(obmat, vec);
if(vec[0] < bbsx){ bbsx= vec[0]; }