From 89c9aaaa25cc7ce60c305d8e30e1c008cb117cf1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 7 Jan 2011 19:18:31 +0000 Subject: remove references to BKE_utildefines where its not needed. - move GS() define into DNA_ID.h - add BLI_utildefines as an automatic include with makesrna generated files. --- source/blender/editors/animation/anim_ipo_utils.c | 2 +- source/blender/editors/animation/keyframes_draw.c | 2 +- source/blender/editors/animation/keyframes_edit.c | 2 +- source/blender/editors/armature/editarmature_generate.c | 2 +- source/blender/editors/armature/meshlaplacian.c | 2 +- source/blender/editors/gpencil/drawgpencil.c | 2 +- source/blender/editors/interface/interface_draw.c | 2 +- source/blender/editors/interface/interface_utils.c | 2 +- source/blender/editors/interface/resources.c | 2 +- source/blender/editors/interface/view2d.c | 2 +- source/blender/editors/mesh/editmesh_lib.c | 2 +- source/blender/editors/physics/particle_edit.c | 2 +- source/blender/editors/physics/particle_object.c | 2 +- source/blender/editors/physics/physics_pointcache.c | 2 +- source/blender/editors/screen/screen_context.c | 2 +- source/blender/editors/sculpt_paint/paint_undo.c | 2 +- source/blender/editors/space_action/action_draw.c | 2 +- source/blender/editors/space_api/spacetypes.c | 2 +- source/blender/editors/space_buttons/buttons_context.c | 2 +- source/blender/editors/space_buttons/buttons_header.c | 2 +- source/blender/editors/space_console/console_draw.c | 2 +- source/blender/editors/space_graph/graph_draw.c | 2 +- source/blender/editors/space_info/info_draw.c | 2 +- source/blender/editors/space_info/textview.c | 2 +- source/blender/editors/space_script/script_header.c | 2 +- source/blender/editors/space_sequencer/sequencer_draw.c | 2 +- source/blender/editors/space_sequencer/sequencer_scopes.c | 2 +- source/blender/editors/space_sound/sound_header.c | 2 +- source/blender/editors/space_text/text_draw.c | 2 +- source/blender/editors/space_view3d/drawarmature.c | 2 +- source/blender/editors/space_view3d/drawmesh.c | 2 +- source/blender/editors/space_view3d/drawobject.c | 2 +- source/blender/editors/space_view3d/drawvolume.c | 2 +- source/blender/editors/transform/transform_constraints.c | 2 +- source/blender/editors/transform/transform_conversions.c | 2 +- source/blender/editors/transform/transform_ndofinput.c | 2 +- source/blender/editors/transform/transform_orientations.c | 2 +- source/blender/editors/util/editmode_undo.c | 2 +- source/blender/editors/uvedit/uvedit_draw.c | 2 +- source/blender/editors/uvedit/uvedit_parametrizer.c | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/animation/anim_ipo_utils.c b/source/blender/editors/animation/anim_ipo_utils.c index 34eb6524484..3e2212c15bb 100644 --- a/source/blender/editors/animation/anim_ipo_utils.c +++ b/source/blender/editors/animation/anim_ipo_utils.c @@ -41,7 +41,7 @@ #include "DNA_anim_types.h" -#include "BKE_utildefines.h" + #include "RNA_access.h" diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 6d0fe4c78fa..5e7e071954c 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -60,7 +60,7 @@ #include "BKE_key.h" #include "BKE_material.h" #include "BKE_global.h" // XXX remove me! -#include "BKE_utildefines.h" + #include "BIF_gl.h" diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index 4ba09a34407..0a21dfcb43f 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -53,7 +53,7 @@ #include "BKE_fcurve.h" #include "BKE_key.h" #include "BKE_material.h" -#include "BKE_utildefines.h" + #include "ED_anim_api.h" #include "ED_keyframes_edit.h" diff --git a/source/blender/editors/armature/editarmature_generate.c b/source/blender/editors/armature/editarmature_generate.c index 23b6af9ba73..527f5ba5e69 100644 --- a/source/blender/editors/armature/editarmature_generate.c +++ b/source/blender/editors/armature/editarmature_generate.c @@ -41,7 +41,7 @@ #include "BLI_graph.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "ED_armature.h" #include "armature_intern.h" diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 8946291fce5..b39af6cac73 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -45,7 +45,7 @@ #include "BKE_DerivedMesh.h" #include "BKE_modifier.h" -#include "BKE_utildefines.h" + #ifdef RIGID_DEFORM #include "BLI_editVert.h" diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 829436380a5..901542ea2de 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -49,7 +49,7 @@ #include "BKE_context.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_utildefines.h" + #include "WM_api.h" diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index e3321edda80..b74165801ce 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -38,7 +38,7 @@ #include "BKE_colortools.h" #include "BKE_texture.h" -#include "BKE_utildefines.h" + #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index 1a31c7110f1..9a6a54bb8ef 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -33,7 +33,7 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_utildefines.h" + #include "RNA_access.h" diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index a096d39ea94..9c5f4067204 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -49,7 +49,7 @@ #include "BKE_global.h" #include "BKE_main.h" #include "BKE_texture.h" -#include "BKE_utildefines.h" + #include "BIF_gl.h" diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index b5c89d6dc73..c97e5d9baea 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -40,7 +40,7 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_utildefines.h" + #include "WM_api.h" diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c index 46ece1a083a..11cf5dfa42c 100644 --- a/source/blender/editors/mesh/editmesh_lib.c +++ b/source/blender/editors/mesh/editmesh_lib.c @@ -54,7 +54,7 @@ editmesh_lib: generic (no UI, no menus) operations/evaluators for editmesh data #include "BKE_context.h" #include "BKE_global.h" #include "BKE_mesh.h" -#include "BKE_utildefines.h" + #include "ED_mesh.h" #include "ED_screen.h" diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 87ba66cd827..cca5df50118 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -59,7 +59,7 @@ #include "BKE_particle.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_utildefines.h" + #include "BKE_pointcache.h" #include "BIF_gl.h" diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index f86314afafe..6078f05ebd1 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -46,7 +46,7 @@ #include "BKE_main.h" #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "BKE_utildefines.h" + #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 7b531207935..9aa879dad67 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -44,7 +44,7 @@ #include "BKE_pointcache.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_utildefines.h" + #include "ED_particle.h" diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 949ca1d3126..7374b579cab 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -35,7 +35,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_context.h" #include "BKE_object.h" #include "BKE_action.h" diff --git a/source/blender/editors/sculpt_paint/paint_undo.c b/source/blender/editors/sculpt_paint/paint_undo.c index 76cf24d4339..758ef2a2fc1 100644 --- a/source/blender/editors/sculpt_paint/paint_undo.c +++ b/source/blender/editors/sculpt_paint/paint_undo.c @@ -32,7 +32,7 @@ #include "DNA_userdef_types.h" -#include "BKE_utildefines.h" + #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c index 6b0511d2384..4dc77e13192 100644 --- a/source/blender/editors/space_action/action_draw.c +++ b/source/blender/editors/space_action/action_draw.c @@ -45,7 +45,7 @@ #include "BKE_action.h" #include "BKE_context.h" -#include "BKE_utildefines.h" + /* Everything from source (BIF, BDR, BSE) ------------------------------ */ diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index 74f897cd8e8..0aac167fed2 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -32,7 +32,7 @@ #include "DNA_object_types.h" #include "DNA_windowmanager_types.h" -#include "BKE_utildefines.h" + #include "BKE_context.h" #include "BKE_screen.h" diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 75a3e7cbf30..b0b1c23cbc0 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -49,7 +49,7 @@ #include "BKE_particle.h" #include "BKE_screen.h" #include "BKE_texture.h" -#include "BKE_utildefines.h" + #include "RNA_access.h" diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 66c96ce591b..bd1674aa307 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -32,7 +32,7 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_context.h" #include "ED_screen.h" diff --git a/source/blender/editors/space_console/console_draw.c b/source/blender/editors/space_console/console_draw.c index 6c3666a56b4..2d4501e6005 100644 --- a/source/blender/editors/space_console/console_draw.c +++ b/source/blender/editors/space_console/console_draw.c @@ -37,7 +37,7 @@ #include "DNA_screen_types.h" #include "BKE_report.h" -#include "BKE_utildefines.h" + #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c index 271b6ae8fde..b2e9f93685e 100644 --- a/source/blender/editors/space_graph/graph_draw.c +++ b/source/blender/editors/space_graph/graph_draw.c @@ -49,7 +49,7 @@ #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_fcurve.h" -#include "BKE_utildefines.h" + #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c index ba3beffafce..71424bb8384 100644 --- a/source/blender/editors/space_info/info_draw.c +++ b/source/blender/editors/space_info/info_draw.c @@ -42,7 +42,7 @@ // #include "BKE_suggestions.h" #include "BKE_report.h" -#include "BKE_utildefines.h" + #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c index 251aa1cdd98..0f11dee7d5a 100644 --- a/source/blender/editors/space_info/textview.c +++ b/source/blender/editors/space_info/textview.c @@ -32,7 +32,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_script/script_header.c b/source/blender/editors/space_script/script_header.c index 3e6ebe64920..545be69af54 100644 --- a/source/blender/editors/space_script/script_header.c +++ b/source/blender/editors/space_script/script_header.c @@ -32,7 +32,7 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_context.h" #include "ED_screen.h" diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 47efdb6ad3b..635e261b26e 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -45,7 +45,7 @@ #include "BKE_context.h" #include "BKE_global.h" #include "BKE_sequencer.h" -#include "BKE_utildefines.h" + #include "BKE_sound.h" #include "IMB_imbuf.h" diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index 8f879003a2d..b8b34eacdc0 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -28,7 +28,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" diff --git a/source/blender/editors/space_sound/sound_header.c b/source/blender/editors/space_sound/sound_header.c index cdb5ce67a7e..60bf0775f5e 100644 --- a/source/blender/editors/space_sound/sound_header.c +++ b/source/blender/editors/space_sound/sound_header.c @@ -35,7 +35,7 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_context.h" #include "ED_screen.h" diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index 620067b035c..6c321ae4a1c 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -46,7 +46,7 @@ #include "BKE_context.h" #include "BKE_suggestions.h" #include "BKE_text.h" -#include "BKE_utildefines.h" + #include "BIF_gl.h" diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 82859591beb..18a83e16ca1 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -51,7 +51,7 @@ #include "BKE_global.h" #include "BKE_modifier.h" #include "BKE_nla.h" -#include "BKE_utildefines.h" + #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 6cd31328b1e..c6cbfe44df4 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -50,7 +50,7 @@ #include "BKE_material.h" #include "BKE_paint.h" #include "BKE_property.h" -#include "BKE_utildefines.h" + #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 49c6cea6c7d..17e8b09ad68 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -68,7 +68,7 @@ #include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_unit.h" -#include "BKE_utildefines.h" + #include "smoke_API.h" #include "BIF_gl.h" diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index d3691e7300a..0f6e0bdc834 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -62,7 +62,7 @@ #include "BKE_particle.h" #include "BKE_property.h" #include "BKE_smoke.h" -#include "BKE_utildefines.h" + #include "smoke_API.h" #include "BIF_gl.h" diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 5ad910dfe5d..d5700db8c57 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -49,7 +49,7 @@ #include "BIF_glutil.h" #include "BKE_context.h" -#include "BKE_utildefines.h" + #include "ED_image.h" #include "ED_view3d.h" diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index b0a59fd0c53..75458335b05 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -69,7 +69,7 @@ #include "BKE_bmesh.h" #include "BKE_scene.h" #include "BKE_report.h" -#include "BKE_utildefines.h" + #include "ED_anim_api.h" #include "ED_armature.h" diff --git a/source/blender/editors/transform/transform_ndofinput.c b/source/blender/editors/transform/transform_ndofinput.c index a236f7b205f..ae12daa29ad 100644 --- a/source/blender/editors/transform/transform_ndofinput.c +++ b/source/blender/editors/transform/transform_ndofinput.c @@ -30,7 +30,7 @@ #include "BLI_utildefines.h" #include "BKE_global.h" /* for G */ -#include "BKE_utildefines.h" /* ABS */ + /* ABS */ #include "WM_types.h" diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index ccef20fc1bf..2c6870f20c0 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -34,7 +34,7 @@ #include "DNA_screen_types.h" #include "DNA_view3d_types.h" -#include "BKE_utildefines.h" + #include "BKE_armature.h" #include "BKE_context.h" #include "BKE_report.h" diff --git a/source/blender/editors/util/editmode_undo.c b/source/blender/editors/util/editmode_undo.c index 1a4cf14dff6..cff30f12369 100644 --- a/source/blender/editors/util/editmode_undo.c +++ b/source/blender/editors/util/editmode_undo.c @@ -41,7 +41,7 @@ #include "BLI_dynstr.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_global.h" diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 2fe9c7f5484..fc217411386 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -41,7 +41,7 @@ #include "BKE_DerivedMesh.h" #include "BKE_mesh.h" -#include "BKE_utildefines.h" + #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index cf17f8cff00..f812de692e2 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -8,7 +8,7 @@ #include "BLI_boxpack2d.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "ONL_opennl.h" -- cgit v1.2.3