From 4824e7eeeb82fcad72f222fe0d74c41c374b648e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 12 Apr 2010 22:33:43 +0000 Subject: modifier include cleanup, this might need fixes on other systems but hard to avoid. also removed unused stuff from cmake modifier file --- source/blender/modifiers/CMakeLists.txt | 17 +------- source/blender/modifiers/intern/MOD_armature.c | 42 +------------------- source/blender/modifiers/intern/MOD_array.c | 41 ++----------------- source/blender/modifiers/intern/MOD_bevel.c | 44 +-------------------- source/blender/modifiers/intern/MOD_boolean.c | 40 ------------------- source/blender/modifiers/intern/MOD_boolean_util.c | 13 ++---- source/blender/modifiers/intern/MOD_build.c | 31 --------------- source/blender/modifiers/intern/MOD_cast.c | 42 +------------------- source/blender/modifiers/intern/MOD_cloth.c | 46 ---------------------- source/blender/modifiers/intern/MOD_collision.c | 39 +----------------- source/blender/modifiers/intern/MOD_curve.c | 43 -------------------- source/blender/modifiers/intern/MOD_decimate.c | 39 +----------------- source/blender/modifiers/intern/MOD_displace.c | 45 ++------------------- source/blender/modifiers/intern/MOD_edgesplit.c | 42 +++----------------- source/blender/modifiers/intern/MOD_explode.c | 41 ++----------------- source/blender/modifiers/intern/MOD_fluidsim.c | 36 +---------------- .../blender/modifiers/intern/MOD_fluidsim_util.c | 27 +++++-------- source/blender/modifiers/intern/MOD_hook.c | 46 ++-------------------- source/blender/modifiers/intern/MOD_lattice.c | 43 -------------------- source/blender/modifiers/intern/MOD_mask.c | 42 +------------------- source/blender/modifiers/intern/MOD_meshdeform.c | 44 ++------------------- source/blender/modifiers/intern/MOD_mirror.c | 44 ++------------------- source/blender/modifiers/intern/MOD_multires.c | 45 --------------------- .../modifiers/intern/MOD_particleinstance.c | 31 +-------------- .../blender/modifiers/intern/MOD_particlesystem.c | 22 ----------- source/blender/modifiers/intern/MOD_screw.c | 14 ++----- source/blender/modifiers/intern/MOD_shapekey.c | 6 --- source/blender/modifiers/intern/MOD_shrinkwrap.c | 4 -- source/blender/modifiers/intern/MOD_simpledeform.c | 8 ---- source/blender/modifiers/intern/MOD_smoke.c | 5 --- source/blender/modifiers/intern/MOD_smooth.c | 5 --- source/blender/modifiers/intern/MOD_softbody.c | 5 --- source/blender/modifiers/intern/MOD_solidify.c | 7 +--- source/blender/modifiers/intern/MOD_subsurf.c | 6 +-- source/blender/modifiers/intern/MOD_surface.c | 13 ++---- source/blender/modifiers/intern/MOD_util.c | 13 +++--- source/blender/modifiers/intern/MOD_uvproject.c | 14 ++----- source/blender/modifiers/intern/MOD_wave.c | 15 ++----- 38 files changed, 73 insertions(+), 987 deletions(-) diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 95914917efd..51cd5223cf5 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -28,33 +28,18 @@ FILE(GLOB SRC intern/*.c) SET(INC . ./intern - ../../../intern/guardedalloc - ../include ../blenlib ../makesdna ../blenkernel ../blenkernel/intern ../render/extern/include + ../../../intern/guardedalloc ../../../intern/decimation/extern ../../../intern/elbeem/extern ../../../intern/bsp/extern ${ZLIB_INC} ) -IF(WITH_LZO) - SET(INC ${INC} ../../../extern/lzo/minilzo) - ADD_DEFINITIONS(-DWITH_LZO) -ENDIF(WITH_LZO) - -IF(WITH_LZMA) - SET(INC ${INC} ../../../extern/lzma) - ADD_DEFINITIONS(-DWITH_LZMA) -ENDIF(WITH_LZMA) - -IF(WITH_OPENMP) - ADD_DEFINITIONS(-DPARALLEL=1) -ENDIF(WITH_OPENMP) - IF(NOT WITH_ELBEEM) ADD_DEFINITIONS(-DDISABLE_ELBEEM) ENDIF(NOT WITH_ELBEEM) diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 6e2a65540ed..f0c28cb8aef 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -30,59 +30,21 @@ * */ -#include "stddef.h" #include "string.h" -#include "stdarg.h" -#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_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 "MEM_guardedalloc.h" -#include "CCGSubSurf.h" +#include "depsgraph_private.h" -#include "MOD_modifiertypes.h" #include "MOD_util.h" -/* Armature */ - static void initData(ModifierData *md) { ArmatureModifierData *amd = (ArmatureModifierData*) md; diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 367902d3d0b..447862b6f49 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -30,56 +30,23 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#include "math.h" -#include "float.h" +/* Array modifier: duplicates the object multiple times along an axis */ -#include "BLI_math.h" -#include "BLI_rand.h" -#include "BLI_ghash.h" -#include "BLI_edgehash.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_meshdata_types.h" +#include "BLI_math.h" +#include "BLI_ghash.h" +#include "BLI_edgehash.h" -#include "BKE_action.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 "MOD_modifiertypes.h" - -/* Array */ -/* Array modifier: duplicates the object multiple times along an axis -*/ - static void initData(ModifierData *md) { ArrayModifierData *amd = (ArrayModifierData*) md; diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 60d61fabe24..eabd6e4957d 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -30,53 +30,11 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#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_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" + static void initData(ModifierData *md) { diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 36d44f40521..116f5ab22d2 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -30,52 +30,12 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#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_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_boolean_util.h" diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c index 43f9f65374f..98f27d7b1b9 100644 --- a/source/blender/modifiers/intern/MOD_boolean_util.c +++ b/source/blender/modifiers/intern/MOD_boolean_util.c @@ -28,21 +28,14 @@ * CSG operations. */ -#include -#include - -#include "MEM_guardedalloc.h" - -#include "BLI_math.h" -#include "BLI_ghash.h" - #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "CSG_BooleanOps.h" +#include "BLI_math.h" +#include "BLI_ghash.h" #include "BKE_cdderivedmesh.h" #include "BKE_depsgraph.h" @@ -50,7 +43,7 @@ #include "BKE_mesh.h" #include "BKE_object.h" - +#include "CSG_BooleanOps.h" /** * Here's the vertex iterator structure used to walk through diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index bb0e14fd08b..38ba587c631 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -30,48 +30,17 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#include "math.h" -#include "float.h" - -#include "BLI_kdtree.h" #include "BLI_rand.h" -#include "BLI_uvproject.h" #include "BLI_ghash.h" -#include "MEM_guardedalloc.h" - #include "DNA_scene_types.h" #include "DNA_meshdata_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_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" static void initData(ModifierData *md) diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index 01d0961c9cd..3f97dfc150c 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -30,55 +30,17 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#include "math.h" -#include "float.h" +#include "DNA_meshdata_types.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 "DNA_object_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_scene_types.h" -#include "DNA_customdata_types.h" +#include "BKE_deform.h" #include "BKE_DerivedMesh.h" - -#include "BKE_action.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_utildefines.h" -#include "BKE_texture.h" #include "depsgraph_private.h" -#include "BKE_deform.h" -#include "BKE_shrinkwrap.h" -#include "MOD_modifiertypes.h" #include "MOD_util.h" static void initData(ModifierData *md) diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 04eaa434ac7..bc2156c1ff7 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -30,59 +30,13 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#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_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 "LOD_decimation.h" - -#include "CCGSubSurf.h" - -#include "RE_shader_ext.h" - -#include "MOD_modifiertypes.h" static void initData(ModifierData *md) diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 716bd0d7405..af8e7605128 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -30,54 +30,17 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#include "math.h" -#include "float.h" +#include "DNA_scene_types.h" -#include "BLI_kdtree.h" -#include "BLI_rand.h" #include "BLI_math.h" -#include "BLI_edgehash.h" - -#include "MEM_guardedalloc.h" - -#include "DNA_scene_types.h" -#include "DNA_meshdata_types.h" #include "BKE_collision.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 "LOD_decimation.h" - -#include "CCGSubSurf.h" - -#include "RE_shader_ext.h" -#include "MOD_modifiertypes.h" static void initData(ModifierData *md) { diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index 5ed06da3e05..6f1142ae6b9 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -30,58 +30,15 @@ * */ -#include "stddef.h" #include "string.h" -#include "stdarg.h" -#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_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 "LOD_decimation.h" - -#include "CCGSubSurf.h" - -#include "RE_shader_ext.h" - -#include "MOD_modifiertypes.h" static void initData(ModifierData *md) diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 73ca7d6a0bc..9163a9771f0 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -30,55 +30,20 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#include "math.h" -#include "float.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 "depsgraph_private.h" -#include "BKE_deform.h" +#include "MEM_guardedalloc.h" #include "LOD_decimation.h" -#include "RE_shader_ext.h" - -#include "MOD_modifiertypes.h" - - static void initData(ModifierData *md) { DecimateModifierData *dmd = (DecimateModifierData*) md; diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 946eb4bffba..531aaff504b 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -30,59 +30,22 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#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_meshdata_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 "depsgraph_private.h" #include "BKE_deform.h" -#include "BKE_shrinkwrap.h" -#include "LOD_decimation.h" +#include "depsgraph_private.h" +#include "MEM_guardedalloc.h" -#include "CCGSubSurf.h" +#include "MOD_util.h" #include "RE_shader_ext.h" -#include "MOD_modifiertypes.h" -#include "MOD_util.h" - /* Displace */ diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index cef860299f3..bb1ede089e9 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -30,55 +30,23 @@ * */ -#include "stddef.h" -#include "string.h" -#include "math.h" -#include "float.h" +/* EdgeSplit modifier: Splits edges in the mesh according to sharpness flag + * or edge angle (can be used to achieve autosmoothing) */ + +#include "DNA_meshdata_types.h" #include "BLI_listbase.h" #include "BLI_memarena.h" #include "BLI_edgehash.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_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 "depsgraph_private.h" -#include "BKE_deform.h" -#include "BKE_shrinkwrap.h" - -#include "LOD_decimation.h" - -#include "CCGSubSurf.h" - -#include "RE_shader_ext.h" +#include "MEM_guardedalloc.h" -#include "MOD_modifiertypes.h" -/* EdgeSplit modifier: Splits edges in the mesh according to sharpness flag - * or edge angle (can be used to achieve autosmoothing) -*/ #if 0 #define EDGESPLIT_DEBUG_3 #define EDGESPLIT_DEBUG_2 diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index 5c8bf972921..12f46d01e01 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -30,59 +30,24 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#include "math.h" -#include "float.h" +#include "DNA_meshdata_types.h" +#include "DNA_scene_types.h" #include "BLI_kdtree.h" #include "BLI_rand.h" #include "BLI_math.h" #include "BLI_edgehash.h" -#include "MEM_guardedalloc.h" - -#include "DNA_meshdata_types.h" -#include "DNA_scene_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_utildefines.h" - -#include "depsgraph_private.h" #include "BKE_deform.h" -#include "BKE_shrinkwrap.h" - -#include "LOD_decimation.h" -#include "CCGSubSurf.h" - -#include "RE_shader_ext.h" - -#include "MOD_modifiertypes.h" +#include "MEM_guardedalloc.h" static void initData(ModifierData *md) diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c index 82c82ccdfb4..f272e7f18a6 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim.c +++ b/source/blender/modifiers/intern/MOD_fluidsim.c @@ -30,50 +30,16 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#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_meshdata_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 "MOD_modifiertypes.h" #include "MOD_fluidsim_util.h" - +#include "MEM_guardedalloc.h" /* Fluidsim */ static void initData(ModifierData *md) diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index d457c0cb4a6..0c5428cc9d8 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -31,33 +31,26 @@ */ #include -#include -#include -#include -#include -#include #include +#include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_object_fluidsim.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" +#include "BKE_global.h" /* G.sce only */ #include "MOD_modifiertypes.h" -#include "MOD_fluidsim_util.h" + +#include "MEM_guardedalloc.h" // headers for fluidsim bobj meshes #include "LBM_fluidsim.h" diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index da1a8fc05b4..6ca5e3ee83c 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -30,58 +30,18 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#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_mesh_types.h" #include "DNA_meshdata_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 "depsgraph_private.h" #include "BKE_deform.h" -#include "BKE_shrinkwrap.h" - -#include "LOD_decimation.h" - -#include "CCGSubSurf.h" -#include "RE_shader_ext.h" - -#include "MOD_modifiertypes.h" +#include "depsgraph_private.h" +#include "MEM_guardedalloc.h" static void initData(ModifierData *md) diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index 031dfc417f7..c5100578fff 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -30,57 +30,14 @@ * */ -#include "stddef.h" #include "string.h" -#include "stdarg.h" -#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 "CCGSubSurf.h" - -#include "RE_shader_ext.h" -#include "MOD_modifiertypes.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index 9920f685003..6d6ccb0e3a2 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -30,55 +30,17 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#include "math.h" -#include "float.h" - -#include "BLI_ghash.h" - -#include "MEM_guardedalloc.h" - #include "DNA_armature_types.h" #include "DNA_meshdata_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_material_types.h" -#include "DNA_object_fluidsim.h" +#include "BLI_ghash.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 "CCGSubSurf.h" -#include "RE_shader_ext.h" - -#include "MOD_modifiertypes.h" +#include "depsgraph_private.h" static void copyData(ModifierData *md, ModifierData *target) diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index a145c986742..f10dbf94060 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -30,58 +30,20 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#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_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 "LOD_decimation.h" -#include "CCGSubSurf.h" +#include "depsgraph_private.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_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 1078990b81d..442202655ee 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -30,57 +30,19 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#include "math.h" -#include "float.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 "depsgraph_private.h" #include "BKE_deform.h" -#include "BKE_shrinkwrap.h" #include "BKE_utildefines.h" -#include "LOD_decimation.h" - -#include "CCGSubSurf.h" - -#include "RE_shader_ext.h" - -#include "MOD_modifiertypes.h" - +#include "MEM_guardedalloc.h" +#include "depsgraph_private.h" static void initData(ModifierData *md) { diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c index e0cddb50e3a..945f17494f0 100644 --- a/source/blender/modifiers/intern/MOD_multires.c +++ b/source/blender/modifiers/intern/MOD_multires.c @@ -30,56 +30,11 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#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 "CCGSubSurf.h" - -#include "RE_shader_ext.h" - -#include "MOD_modifiertypes.h" - static void initData(ModifierData *md) { diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index e903e41db3b..545003b1576 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -30,47 +30,20 @@ * */ -#include "stddef.h" -#include "string.h" -#include "stdarg.h" -#include "math.h" -#include "float.h" +#include "DNA_meshdata_types.h" #include "BLI_math.h" #include "BLI_listbase.h" #include "BLI_rand.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 "depsgraph_private.h" -#include "BKE_deform.h" -#include "BKE_shrinkwrap.h" #include "BKE_utildefines.h" - -#include "MOD_modifiertypes.h" +#include "depsgraph_private.h" static void initData(ModifierData *md) diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index d44db02a81b..d806ab71f24 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -31,36 +31,14 @@ */ #include "stddef.h" -#include "string.h" -#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_material.h" -#include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_object.h" #include "BKE_particle.h" -#include "BKE_pointcache.h" -#include "BKE_smoke.h" - -#include "BKE_deform.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 455451b3d6e..ce0667c4fbc 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -30,26 +30,18 @@ * */ -#include "stddef.h" -#include "string.h" -#include "math.h" -#include "float.h" - -#include "BLI_math.h" +/* Screw modifier: revolves the edges about an axis */ #include "DNA_meshdata_types.h" +#include "BLI_math.h" + #include "BKE_cdderivedmesh.h" #include "depsgraph_private.h" - #include "MOD_modifiertypes.h" - #include "MEM_guardedalloc.h" -/* Screw modifier: revolves the edges about an axis -*/ - /* used for gathering edge connectivity */ typedef struct ScrewVertConnect { float dist; /* distance from the center axis */ diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index 07cc5e37e1e..f73dcc25235 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -30,16 +30,10 @@ * */ -#include "stddef.h" -#include "string.h" -#include "math.h" -#include "float.h" - #include "BLI_math.h" #include "DNA_key_types.h" - #include "BKE_cdderivedmesh.h" #include "BKE_key.h" #include "BKE_particle.h" diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index e7927ffa6ea..f4561d7cdae 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -30,10 +30,7 @@ * */ -#include "stddef.h" #include "string.h" -#include "math.h" -#include "float.h" #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" @@ -41,7 +38,6 @@ #include "depsgraph_private.h" -#include "MOD_modifiertypes.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index 1aebdf06457..b71a598e24e 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -30,11 +30,6 @@ * */ -#include "stddef.h" -#include "string.h" -#include "math.h" -#include "float.h" - #include "DNA_meshdata_types.h" #include "BLI_math.h" @@ -48,11 +43,8 @@ #include "depsgraph_private.h" -#include "MOD_modifiertypes.h" #include "MOD_util.h" -#include -#include /* Clamps/Limits the given coordinate to: limits[0] <= co[axis] <= limits[1] diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index 66228984ac9..32d908a5552 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -31,9 +31,6 @@ */ #include "stddef.h" -#include "string.h" -#include "math.h" -#include "float.h" #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" @@ -41,8 +38,6 @@ #include "depsgraph_private.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 3b259632c45..ca72c37a72c 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -30,11 +30,6 @@ * */ -#include "stddef.h" -#include "string.h" -#include "math.h" -#include "float.h" - #include "DNA_meshdata_types.h" #include "BLI_math.h" diff --git a/source/blender/modifiers/intern/MOD_softbody.c b/source/blender/modifiers/intern/MOD_softbody.c index 63c94f3bc15..8f629001e0b 100644 --- a/source/blender/modifiers/intern/MOD_softbody.c +++ b/source/blender/modifiers/intern/MOD_softbody.c @@ -30,11 +30,6 @@ * */ -#include "stddef.h" -#include "string.h" -#include "math.h" -#include "float.h" - #include "DNA_scene_types.h" #include "BKE_cdderivedmesh.h" diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 4429e363236..d56102f2250 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -30,16 +30,11 @@ * */ -#include "stddef.h" -#include "string.h" -#include "math.h" -#include "float.h" +#include "DNA_meshdata_types.h" #include "BLI_math.h" #include "BLI_edgehash.h" -#include "DNA_meshdata_types.h" - #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" #include "BKE_particle.h" diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index ff3b6e9bb98..799df64b2b5 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -31,9 +31,6 @@ */ #include "stddef.h" -#include "string.h" -#include "math.h" -#include "float.h" #include "DNA_scene_types.h" #include "DNA_object_types.h" @@ -42,10 +39,9 @@ #include "BKE_scene.h" #include "BKE_subsurf.h" -#include "CCGSubSurf.h" - #include "MOD_modifiertypes.h" +#include "CCGSubSurf.h" static void initData(ModifierData *md) { diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index 116483caea6..223d8e7792f 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -30,24 +30,19 @@ * */ -#include "stddef.h" -#include "string.h" -#include "math.h" -#include "float.h" - -#include "BLI_math.h" - #include "DNA_scene_types.h" #include "DNA_object_types.h" #include "DNA_meshdata_types.h" -#include "MEM_guardedalloc.h" +#include "BLI_math.h" + #include "BKE_cdderivedmesh.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" -/* Surface */ +#include "MEM_guardedalloc.h" + static void initData(ModifierData *md) { diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index 8c08bce4df9..d4e202a73b9 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -30,23 +30,22 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include "string.h" + #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_curve_types.h" -#include "MEM_guardedalloc.h" -#include "MOD_util.h" - #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" #include "BKE_displist.h" +#include "BKE_utildefines.h" -#include "RE_shader_ext.h" +#include "MOD_util.h" -#include "BKE_utildefines.h" +#include "MEM_guardedalloc.h" -#include "stdlib.h" -#include "string.h" +#include "RE_shader_ext.h" void get_texture_value(Tex *texture, float *tex_co, TexResult *texres) { diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index b47ab92f74b..2e4194cd1dd 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -30,29 +30,21 @@ * */ -#include "stddef.h" -#include "string.h" -#include "math.h" -#include "float.h" +/* UV Project modifier: Generates UVs projected from an object */ -#include "DNA_camera_types.h" #include "DNA_meshdata_types.h" +#include "DNA_camera_types.h" #include "BLI_math.h" #include "BLI_uvproject.h" #include "BKE_DerivedMesh.h" -#include "depsgraph_private.h" #include "MOD_modifiertypes.h" #include "MOD_util.h" #include "MEM_guardedalloc.h" - - -/* UVProject */ -/* UV Project modifier: Generates UVs projected from an object -*/ +#include "depsgraph_private.h" static void initData(ModifierData *md) { diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index c6f0e96702e..8a328021a0e 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -30,27 +30,18 @@ * */ -#include "stddef.h" -#include "string.h" -#include "math.h" -#include "float.h" - #include "BLI_math.h" -#include "DNA_object_types.h" #include "DNA_meshdata_types.h" #include "DNA_scene_types.h" -#include "DNA_customdata_types.h" -#include "BKE_DerivedMesh.h" - -#include "MEM_guardedalloc.h" +#include "BKE_DerivedMesh.h" #include "BKE_object.h" - -#include "depsgraph_private.h" #include "BKE_deform.h" +#include "depsgraph_private.h" +#include "MEM_guardedalloc.h" #include "RE_shader_ext.h" #include "MOD_modifiertypes.h" -- cgit v1.2.3