From b6ba3c682dd6615e760905572a5bcd69bb46371f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 1 Apr 2018 07:24:45 +0200 Subject: Cleanup: remove global header --- source/blender/blenkernel/intern/armature.c | 1 - source/blender/blenkernel/intern/armature_update.c | 1 - source/blender/blenkernel/intern/cachefile.c | 1 - source/blender/blenkernel/intern/camera.c | 1 - source/blender/blenkernel/intern/fluidsim.c | 1 - source/blender/blenkernel/intern/lamp.c | 1 - source/blender/blenkernel/intern/lattice.c | 1 - source/blender/blenkernel/intern/linestyle.c | 1 - source/blender/blenkernel/intern/mask.c | 1 - source/blender/blenkernel/intern/mask_evaluate.c | 1 - source/blender/blenkernel/intern/particle_system.c | 1 - source/blender/blenkernel/intern/smoke.c | 1 - source/blender/blenkernel/intern/speaker.c | 1 - source/blender/blenkernel/intern/texture.c | 1 - source/blender/blenkernel/intern/world.c | 1 - source/blender/editors/gpencil/gpencil_brush.c | 1 - source/blender/editors/gpencil/gpencil_data.c | 1 - source/blender/editors/gpencil/gpencil_edit.c | 1 - source/blender/editors/io/io_cache.c | 1 - source/blender/editors/mesh/editmesh_extrude.c | 1 - source/blender/editors/mesh/editmesh_utils.c | 1 - source/blender/editors/physics/physics_fluid.c | 3 ++- source/blender/editors/physics/rigidbody_constraint.c | 1 - source/blender/editors/physics/rigidbody_object.c | 1 - source/blender/editors/sculpt_paint/paint_image.c | 1 - source/blender/editors/space_action/action_buttons.c | 1 - source/blender/editors/space_action/action_data.c | 1 - source/blender/editors/space_clip/tracking_ops_orient.c | 1 - source/blender/editors/space_outliner/outliner_edit.c | 1 - source/blender/editors/space_text/text_undo.c | 1 - source/blender/imbuf/intern/anim_movie.c | 1 - source/blender/imbuf/intern/thumbs_blend.c | 1 - source/blender/imbuf/intern/util.c | 1 - source/blender/makesrna/intern/rna_sequencer.c | 1 - source/blender/modifiers/intern/MOD_fluidsim_util.c | 4 +++- source/blender/modifiers/intern/MOD_meshsequencecache.c | 1 - source/blender/modifiers/intern/MOD_particleinstance.c | 1 - source/blender/physics/intern/implicit_blender.c | 1 - 38 files changed, 5 insertions(+), 38 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 2edbd088334..70a3772f388 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -64,7 +64,6 @@ #include "BKE_DerivedMesh.h" #include "BKE_deform.h" #include "BKE_displist.h" -#include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_library.h" #include "BKE_library_query.h" diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c index e6bb0d6b7ce..56e9cce1825 100644 --- a/source/blender/blenkernel/intern/armature_update.c +++ b/source/blender/blenkernel/intern/armature_update.c @@ -48,7 +48,6 @@ #include "BIK_api.h" -#include "BKE_global.h" #include "BKE_main.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c index 8b7118db151..058394fc1b1 100644 --- a/source/blender/blenkernel/intern/cachefile.c +++ b/source/blender/blenkernel/intern/cachefile.c @@ -42,7 +42,6 @@ #include "BKE_animsys.h" #include "BKE_cachefile.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_modifier.h" diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 719125b3317..132cbd07ac3 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -47,7 +47,6 @@ #include "BKE_animsys.h" #include "BKE_camera.h" #include "BKE_object.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_library_remap.h" diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index 30ead3ffbb6..7dc6e3575b2 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -54,7 +54,6 @@ #include "BKE_customdata.h" #include "BKE_DerivedMesh.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_modifier.h" #include "BKE_mesh.h" diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c index 3a4c920d8fb..2714c4f43a1 100644 --- a/source/blender/blenkernel/intern/lamp.c +++ b/source/blender/blenkernel/intern/lamp.c @@ -47,7 +47,6 @@ #include "BKE_animsys.h" #include "BKE_colortools.h" #include "BKE_icons.h" -#include "BKE_global.h" #include "BKE_lamp.h" #include "BKE_library.h" #include "BKE_library_query.h" diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index ea4c3f380ff..4b9748133d7 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -55,7 +55,6 @@ #include "BKE_curve.h" #include "BKE_depsgraph.h" #include "BKE_displist.h" -#include "BKE_global.h" #include "BKE_key.h" #include "BKE_lattice.h" #include "BKE_library.h" diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index 878f38256b4..e00884c8a9d 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -47,7 +47,6 @@ #include "BKE_colorband.h" #include "BKE_context.h" #include "BKE_freestyle.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_linestyle.h" #include "BKE_node.h" diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index ff4e7f36018..b5742dbdbb7 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -52,7 +52,6 @@ #include "BKE_animsys.h" #include "BKE_curve.h" #include "BKE_depsgraph.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_mask.h" diff --git a/source/blender/blenkernel/intern/mask_evaluate.c b/source/blender/blenkernel/intern/mask_evaluate.c index 889f65da689..e2a9691e577 100644 --- a/source/blender/blenkernel/intern/mask_evaluate.c +++ b/source/blender/blenkernel/intern/mask_evaluate.c @@ -43,7 +43,6 @@ #include "BKE_curve.h" #include "BKE_depsgraph.h" -#include "BKE_global.h" #include "BKE_mask.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 1a18528ba84..8aeeee5a1ad 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -76,7 +76,6 @@ #include "BKE_effect.h" #include "BKE_library_query.h" #include "BKE_particle.h" -#include "BKE_global.h" #include "BKE_DerivedMesh.h" #include "BKE_object.h" diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index bf473603c0e..e12b981a8f9 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -72,7 +72,6 @@ #include "BKE_customdata.h" #include "BKE_deform.h" #include "BKE_DerivedMesh.h" -#include "BKE_global.h" #include "BKE_effect.h" #include "BKE_main.h" #include "BKE_modifier.h" diff --git a/source/blender/blenkernel/intern/speaker.c b/source/blender/blenkernel/intern/speaker.c index 9d604a9382a..1d2e12f34ac 100644 --- a/source/blender/blenkernel/intern/speaker.c +++ b/source/blender/blenkernel/intern/speaker.c @@ -32,7 +32,6 @@ #include "BLI_utildefines.h" #include "BKE_animsys.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_library_remap.h" diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 0e2ac811a41..250408642bb 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -55,7 +55,6 @@ #include "IMB_imbuf.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BKE_colorband.h" diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 10fcfaa444f..5736c9331bf 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -43,7 +43,6 @@ #include "BLI_listbase.h" #include "BKE_animsys.h" -#include "BKE_global.h" #include "BKE_icons.h" #include "BKE_library.h" #include "BKE_library_query.h" diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index bb3800941ab..5fe16226421 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -54,7 +54,6 @@ #include "DNA_object_types.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_gpencil.h" #include "BKE_library.h" #include "BKE_report.h" diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index 5bd5c9c74b9..fca9a2c10f2 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -53,7 +53,6 @@ #include "DNA_gpencil_types.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_gpencil.h" #include "BKE_library.h" #include "BKE_object.h" diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 726215255aa..bc54bd89958 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -55,7 +55,6 @@ #include "DNA_gpencil_types.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_gpencil.h" #include "BKE_library.h" #include "BKE_report.h" diff --git a/source/blender/editors/io/io_cache.c b/source/blender/editors/io/io_cache.c index 975bbddd893..eb79d0bec13 100644 --- a/source/blender/editors/io/io_cache.c +++ b/source/blender/editors/io/io_cache.c @@ -33,7 +33,6 @@ #include "BKE_cachefile.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_report.h" diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index 2c98f05bd27..93049528146 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -36,7 +36,6 @@ #include "BLI_listbase.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BKE_object.h" #include "BKE_report.h" diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index d25304cef89..dceffd462ff 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -43,7 +43,6 @@ #include "BKE_DerivedMesh.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_depsgraph.h" #include "BKE_main.h" #include "BKE_mesh.h" diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 2f95f360fe2..56551a08641 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -48,7 +48,6 @@ #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_fluidsim.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_object.h" @@ -67,6 +66,8 @@ /* enable/disable overall compilation */ #ifdef WITH_MOD_FLUID +#include "BKE_global.h" + #include "WM_api.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/physics/rigidbody_constraint.c b/source/blender/editors/physics/rigidbody_constraint.c index 1bfc162a331..412f9acf718 100644 --- a/source/blender/editors/physics/rigidbody_constraint.c +++ b/source/blender/editors/physics/rigidbody_constraint.c @@ -39,7 +39,6 @@ #include "BKE_context.h" #include "BKE_depsgraph.h" -#include "BKE_global.h" #include "BKE_group.h" #include "BKE_main.h" #include "BKE_report.h" diff --git a/source/blender/editors/physics/rigidbody_object.c b/source/blender/editors/physics/rigidbody_object.c index fa80fb5fbc1..b7083c29721 100644 --- a/source/blender/editors/physics/rigidbody_object.c +++ b/source/blender/editors/physics/rigidbody_object.c @@ -44,7 +44,6 @@ #include "BKE_context.h" #include "BKE_depsgraph.h" -#include "BKE_global.h" #include "BKE_group.h" #include "BKE_main.h" #include "BKE_report.h" diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 5d133ee622f..cb6dba4772f 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -60,7 +60,6 @@ #include "BKE_paint.h" #include "BKE_undo_system.h" -#include "BKE_global.h" #include "UI_interface.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_action/action_buttons.c b/source/blender/editors/space_action/action_buttons.c index bfc808f6d83..0dec95d4340 100644 --- a/source/blender/editors/space_action/action_buttons.c +++ b/source/blender/editors/space_action/action_buttons.c @@ -51,7 +51,6 @@ #include "BKE_depsgraph.h" #include "BKE_fcurve.h" #include "BKE_main.h" -#include "BKE_global.h" #include "BKE_screen.h" #include "BKE_unit.h" diff --git a/source/blender/editors/space_action/action_data.c b/source/blender/editors/space_action/action_data.c index fbef14c07c4..ca8dbbce1a1 100644 --- a/source/blender/editors/space_action/action_data.c +++ b/source/blender/editors/space_action/action_data.c @@ -54,7 +54,6 @@ #include "BKE_animsys.h" #include "BKE_action.h" #include "BKE_fcurve.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_key.h" #include "BKE_main.h" diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c index 71a5a825b0e..8c5be7c9d04 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.c +++ b/source/blender/editors/space_clip/tracking_ops_orient.c @@ -42,7 +42,6 @@ #include "BKE_context.h" #include "BKE_constraint.h" #include "BKE_tracking.h" -#include "BKE_global.h" #include "BKE_depsgraph.h" #include "BKE_object.h" #include "BKE_report.h" diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 0b001ca9578..71edd855cf0 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -52,7 +52,6 @@ #include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_depsgraph.h" -#include "BKE_global.h" #include "BKE_idcode.h" #include "BKE_library.h" #include "BKE_library_query.h" diff --git a/source/blender/editors/space_text/text_undo.c b/source/blender/editors/space_text/text_undo.c index 6bac00fc30c..4f62c409d58 100644 --- a/source/blender/editors/space_text/text_undo.c +++ b/source/blender/editors/space_text/text_undo.c @@ -37,7 +37,6 @@ #include "PIL_time.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_report.h" diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index a770b34ecc6..979b7d9b814 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -68,7 +68,6 @@ #include "MEM_guardedalloc.h" -#include "BKE_global.h" #ifdef WITH_AVI # include "AVI_avi.h" diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c index b5c6deb6b01..d04f5fc87e6 100644 --- a/source/blender/imbuf/intern/thumbs_blend.c +++ b/source/blender/imbuf/intern/thumbs_blend.c @@ -36,7 +36,6 @@ #include "BLO_blend_defs.h" #include "BLO_readfile.h" -#include "BKE_global.h" #include "BKE_idcode.h" #include "BKE_icons.h" #include "BKE_library.h" diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 76a44aa81f7..2b6963b9170 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -43,7 +43,6 @@ #include "BLI_fileops.h" #include "BLI_string.h" -#include "BKE_global.h" #include "imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index cfd6d0c6db3..81c05433e66 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -38,7 +38,6 @@ #include "BLT_translation.h" #include "BKE_animsys.h" -#include "BKE_global.h" #include "BKE_sequencer.h" #include "BKE_sound.h" diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index 65f45c9af64..72c44121e0b 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -48,7 +48,9 @@ #include "BKE_fluidsim.h" /* ensure definitions here match */ #include "BKE_cdderivedmesh.h" -#include "BKE_global.h" /* G.main->name only */ +#ifdef WITH_MOD_FLUID +# include "BKE_global.h" +#endif #include "MOD_fluidsim_util.h" #include "MOD_modifiertypes.h" diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c index 793edf7c370..1116760449d 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.c +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c @@ -33,7 +33,6 @@ #include "BKE_cachefile.h" #include "BKE_DerivedMesh.h" #include "BKE_cdderivedmesh.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_scene.h" diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index d1c457526c2..82c6b82d492 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -44,7 +44,6 @@ #include "BKE_cdderivedmesh.h" #include "BKE_effect.h" -#include "BKE_global.h" #include "BKE_lattice.h" #include "BKE_library_query.h" #include "BKE_modifier.h" diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c index d676b1a1521..0fdc1d86d5c 100644 --- a/source/blender/physics/intern/implicit_blender.c +++ b/source/blender/physics/intern/implicit_blender.c @@ -48,7 +48,6 @@ #include "BKE_cloth.h" #include "BKE_collision.h" #include "BKE_effect.h" -#include "BKE_global.h" #include "BPH_mass_spring.h" -- cgit v1.2.3