- use more inline math funcitons where possible

- swapped in less verbose math functons
- modifier include cleanup

1 files changed, 8 insertions, 73 deletions

diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c
index 15b9fccb420..c2cb90fa76c 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim_util.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c
@@ -32,10 +32,17 @@
 
 #include "stddef.h"
 #include "string.h"
-#include "stdarg.h"
 #include "math.h"
 #include "float.h"
 
+#include "BKE_DerivedMesh.h"
+
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+
+#include "MOD_modifiertypes.h"
+#include "MOD_fluidsim_util.h"
+
 // headers for fluidsim bobj meshes
 #include <stdlib.h>
 #include "LBM_fluidsim.h"
@@ -43,78 +50,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "BLI_kdtree.h"
-#include "BLI_rand.h"
-#include "BLI_uvproject.h"
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
-
-#include "BKE_action.h"
-#include "BKE_bmesh.h"
-#include "BKE_cloth.h"
-#include "BKE_cdderivedmesh.h"
-#include "BKE_displist.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_multires.h"
-#include "BKE_key.h"
-#include "BKE_lattice.h"
-#include "BKE_material.h"
-#include "BKE_mesh.h"
-#include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_smoke.h"
-#include "BKE_softbody.h"
-#include "BKE_subsurf.h"
-#include "BKE_texture.h"
-
-#include "depsgraph_private.h"
-#include "BKE_deform.h"
-#include "BKE_shrinkwrap.h"
-
-#include "MOD_modifiertypes.h"
-#include "MOD_fluidsim_util.h"
-
-
-#include "BLI_storage.h" /* _LARGEFILE_SOURCE */
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_object_fluidsim.h"
-#include "DNA_object_force.h" // for pointcache
-#include "DNA_object_types.h"
-#include "DNA_particle_types.h"
-#include "DNA_scene_types.h" // N_T
-
-#include "BLI_math.h"
-#include "BLI_blenlib.h"
-
-#include "BKE_cdderivedmesh.h"
-#include "BKE_customdata.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_fluidsim.h"
-#include "BKE_global.h"
-#include "BKE_modifier.h"
-#include "BKE_mesh.h"
-#include "BKE_pointcache.h"
-#include "BKE_utildefines.h"
-
-#include "BLO_sys_types.h"
-
 void fluidsim_init(FluidsimModifierData *fluidmd)
 {
 #ifndef DISABLE_ELBEEM