From 9563a8524261b04b021abec27319857b2df001ba Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 12 Apr 2010 01:09:59 +0000 Subject: more header cleanups --- source/blender/blenkernel/intern/modifier.c | 39 ------------------ .../blender/modifiers/intern/MOD_particlesystem.c | 13 ------ source/blender/modifiers/intern/MOD_screw.c | 29 +------------ source/blender/modifiers/intern/MOD_shapekey.c | 34 +--------------- source/blender/modifiers/intern/MOD_shrinkwrap.c | 41 +------------------ source/blender/modifiers/intern/MOD_simpledeform.c | 47 +++------------------- source/blender/modifiers/intern/MOD_smoke.c | 36 ----------------- source/blender/modifiers/intern/MOD_smooth.c | 36 +---------------- source/blender/modifiers/intern/MOD_softbody.c | 36 ----------------- source/blender/modifiers/intern/MOD_solidify.c | 26 +----------- source/blender/modifiers/intern/MOD_subsurf.c | 2 - source/blender/modifiers/intern/MOD_uvproject.c | 10 ++--- 12 files changed, 16 insertions(+), 333 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index eb8775edc9e..cf065bb3467 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -40,50 +40,11 @@ #include "math.h" #include "float.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 "CCGSubSurf.h" - -#include "RE_shader_ext.h" #include "MOD_modifiertypes.h" diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index 0fb49544694..d44db02a81b 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -48,31 +48,18 @@ #include "DNA_material_types.h" #include "DNA_object_fluidsim.h" - #include "BKE_action.h" #include "BKE_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.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 "BKE_deform.h" -#include "RE_shader_ext.h" - #include "MOD_modifiertypes.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 58ce0561e80..455451b3d6e 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -35,43 +35,18 @@ #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" #include "BLI_math.h" -#include "MEM_guardedalloc.h" - #include "DNA_meshdata_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_cdderivedmesh.h" -#include "BKE_key.h" -#include "BKE_material.h" -#include "BKE_mesh.h" -#include "BKE_modifier.h" -#include "BKE_object.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 "LOD_decimation.h" - - -#include "RE_shader_ext.h" #include "MOD_modifiertypes.h" +#include "MEM_guardedalloc.h" + /* Screw modifier: revolves the edges about an axis */ diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index 80a1778c369..07cc5e37e1e 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -35,50 +35,18 @@ #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" #include "BLI_math.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_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.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 "BKE_deform.h" -#include "BKE_shrinkwrap.h" - -#include "LOD_decimation.h" - - -#include "RE_shader_ext.h" #include "MOD_modifiertypes.h" +#include "MEM_guardedalloc.h" static void deformVerts( ModifierData *md, Object *ob, DerivedMesh *derivedData, diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index 4b9492a9c3c..e7927ffa6ea 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -35,55 +35,16 @@ #include "math.h" #include "float.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_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.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 "LOD_decimation.h" - - -#include "RE_shader_ext.h" +#include "depsgraph_private.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" -/* Shrinkwrap */ - static void initData(ModifierData *md) { ShrinkwrapModifierData *smd = (ShrinkwrapModifierData*) md; diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index 6b70775f3ef..1aebdf06457 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -35,59 +35,22 @@ #include "math.h" #include "float.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 "DNA_meshdata_types.h" +#include "BLI_math.h" -#include "BKE_action.h" #include "BKE_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.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 "BKE_utildefines.h" + +#include "depsgraph_private.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" - -#include "DNA_object_types.h" -#include "DNA_modifier_types.h" -#include "DNA_meshdata_types.h" - -#include "BKE_DerivedMesh.h" -#include "BKE_lattice.h" -#include "BKE_deform.h" -#include "BKE_utildefines.h" -#include "BLI_math.h" -#include "BKE_shrinkwrap.h" - #include #include diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index 28d23009baa..66228984ac9 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -35,48 +35,12 @@ #include "math.h" #include "float.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_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.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 "LOD_decimation.h" - -#include "RE_shader_ext.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index c89901bdffa..3b259632c45 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -35,47 +35,15 @@ #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" -#include "BLI_math.h" - -#include "MEM_guardedalloc.h" - #include "DNA_meshdata_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 "BLI_math.h" -#include "BKE_action.h" #include "BKE_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.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 "BKE_deform.h" -#include "BKE_shrinkwrap.h" - -#include "LOD_decimation.h" - -#include "RE_shader_ext.h" +#include "MEM_guardedalloc.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_softbody.c b/source/blender/modifiers/intern/MOD_softbody.c index 654abbe02f1..63c94f3bc15 100644 --- a/source/blender/modifiers/intern/MOD_softbody.c +++ b/source/blender/modifiers/intern/MOD_softbody.c @@ -35,47 +35,11 @@ #include "math.h" #include "float.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" -#include "BLI_uvproject.h" - -#include "MEM_guardedalloc.h" - #include "DNA_scene_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_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.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 "BKE_deform.h" -#include "BKE_shrinkwrap.h" - -#include "LOD_decimation.h" - - -#include "RE_shader_ext.h" #include "MOD_modifiertypes.h" diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 55d3a082e0a..4429e363236 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -38,41 +38,17 @@ #include "BLI_math.h" #include "BLI_edgehash.h" -#include "MEM_guardedalloc.h" - #include "DNA_meshdata_types.h" - -#include "BKE_action.h" #include "BKE_cdderivedmesh.h" -#include "BKE_displist.h" -#include "BKE_fluidsim.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 "BKE_deform.h" - #include "BKE_utildefines.h" -#include "LOD_decimation.h" - - - #include "MOD_modifiertypes.h" +#include "MEM_guardedalloc.h" typedef struct EdgeFaceRef { int f1; /* init as -1 */ diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index 02402988137..ff3b6e9bb98 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -37,12 +37,10 @@ #include "DNA_scene_types.h" #include "DNA_object_types.h" -#include "DNA_meshdata_types.h" #include "BKE_cdderivedmesh.h" #include "BKE_scene.h" #include "BKE_subsurf.h" -#include "BKE_DerivedMesh.h" #include "CCGSubSurf.h" diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index f71e1c1f07d..b47ab92f74b 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -35,15 +35,11 @@ #include "math.h" #include "float.h" -#include "BLI_math.h" -#include "BLI_uvproject.h" - -#include "DNA_object_types.h" #include "DNA_camera_types.h" #include "DNA_meshdata_types.h" -#include "DNA_customdata_types.h" -#include "MEM_guardedalloc.h" +#include "BLI_math.h" +#include "BLI_uvproject.h" #include "BKE_DerivedMesh.h" #include "depsgraph_private.h" @@ -51,6 +47,8 @@ #include "MOD_modifiertypes.h" #include "MOD_util.h" +#include "MEM_guardedalloc.h" + /* UVProject */ /* UV Project modifier: Generates UVs projected from an object -- cgit v1.2.3