diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-07 22:18:31 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-07 22:18:31 +0300 |
commit | 89c9aaaa25cc7ce60c305d8e30e1c008cb117cf1 (patch) | |
tree | ac9e9fc1a682129df4af48a3b9a2fb59e3e85fcf /source/blender/blenkernel/intern | |
parent | 8f21a43535cb200c0569566a1b012aec883aa53c (diff) |
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.
Diffstat (limited to 'source/blender/blenkernel/intern')
46 files changed, 49 insertions, 46 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 3b8da3975a0..aeb1f525943 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -53,7 +53,7 @@ #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_texture.h" -#include "BKE_utildefines.h" + #include "BLO_sys_types.h" // for intptr_t support diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index bd36e1b2720..08b57ba18a3 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -53,7 +53,7 @@ #include "BKE_library.h" #include "BKE_main.h" #include "BKE_object.h" -#include "BKE_utildefines.h" + #include "BKE_idprop.h" #include "BIK_api.h" diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 0367d854169..1a219939b77 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -64,7 +64,7 @@ #include "BKE_lattice.h" #include "BKE_main.h" #include "BKE_object.h" -#include "BKE_utildefines.h" + #include "BIK_api.h" #include "BKE_sketch.h" diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 7d75912f31d..1d616c77f04 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -82,7 +82,7 @@ #include "BLO_readfile.h" #include "BLO_writefile.h" -#include "BKE_utildefines.h" // O_BINARY FALSE +#include "BKE_utildefines.h" #include "WM_api.h" // XXXXX BAD, very BAD dependency (bad level call) - remove asap, elubie diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index 85ee3760849..228827bab68 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -47,7 +47,7 @@ #include "BKE_effect.h" #include "BKE_boids.h" #include "BKE_particle.h" -#include "BKE_utildefines.h" + #include "BKE_modifier.h" #include "RNA_enum_types.h" diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 0d3825fa8a8..db7b9b276a2 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -23,7 +23,7 @@ * * The Original Code is: all of this file. * - * Contributor(s): André Pinto. + * Contributor(s): Andr Pinto. * * ***** END GPL LICENSE BLOCK ***** */ @@ -38,7 +38,7 @@ #include "BLI_utildefines.h" #include "BKE_DerivedMesh.h" -#include "BKE_utildefines.h" + #include "BLI_math.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 956972e8d5b..a0750308a2d 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -47,7 +47,7 @@ #include "BKE_global.h" #include "BKE_mesh.h" #include "BKE_paint.h" -#include "BKE_utildefines.h" + #include "DNA_meshdata_types.h" #include "DNA_object_types.h" diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 4b14e64ee27..8cc3a3fc07a 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -42,7 +42,7 @@ #include "BKE_global.h" #include "BKE_modifier.h" #include "BKE_pointcache.h" -#include "BKE_utildefines.h" + #ifdef _WIN32 void tstart ( void ) diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 8f028914ece..e7dff52db62 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -50,7 +50,7 @@ #include "BKE_mesh.h" #include "BKE_object.h" #include "BKE_modifier.h" -#include "BKE_utildefines.h" + #include "BKE_DerivedMesh.h" #ifdef USE_BULLET #include "Bullet-C-Api.h" diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index 282a055e04c..1bfefef4b71 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -48,7 +48,7 @@ #include "BKE_colortools.h" #include "BKE_curve.h" #include "BKE_fcurve.h" -#include "BKE_utildefines.h" + #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index ad6b3b8f837..c497132fa99 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -53,7 +53,7 @@ #include "DNA_scene_types.h" #include "DNA_text_types.h" -#include "BKE_utildefines.h" + #include "BKE_action.h" #include "BKE_anim.h" /* for the curve calculation part */ #include "BKE_armature.h" diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index b5550768e55..13a53629d9b 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -59,7 +59,7 @@ #include "BKE_library.h" #include "BKE_main.h" #include "BKE_object.h" -#include "BKE_utildefines.h" // VECCOPY + #include "ED_curve.h" diff --git a/source/blender/blenkernel/intern/customdata_file.c b/source/blender/blenkernel/intern/customdata_file.c index ebc21344810..6fb79a0df28 100644 --- a/source/blender/blenkernel/intern/customdata_file.c +++ b/source/blender/blenkernel/intern/customdata_file.c @@ -32,7 +32,7 @@ #include "BKE_customdata_file.h" #include "BKE_global.h" -#include "BKE_utildefines.h" + /************************* File Format Definitions ***************************/ diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index aeec2a588c7..a79a5fddf00 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -87,7 +87,7 @@ #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_scene.h" -#include "BKE_utildefines.h" + #include "RE_render_ext.h" #include "RE_shader_ext.h" diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c index 612ea84abe5..641313b564c 100644 --- a/source/blender/blenkernel/intern/exotic.c +++ b/source/blender/blenkernel/intern/exotic.c @@ -66,7 +66,7 @@ #include "BLI_storage.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_blender.h" #include "BKE_global.h" #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index c4db31d732d..3db9731310c 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -52,7 +52,7 @@ #include "BKE_global.h" #include "BKE_modifier.h" #include "BKE_mesh.h" -#include "BKE_utildefines.h" + // headers for fluidsim bobj meshes #include <stdlib.h> diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index 40636fe59d1..e4aeb45a209 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -42,7 +42,7 @@ #include "BKE_fcurve.h" #include "BKE_idprop.h" -#include "BKE_utildefines.h" + #define SMALL -1.0e-10 #define SELECT 1 diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 4d02697920b..c3e2d7ffcf4 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -42,7 +42,7 @@ #include "BKE_gpencil.h" #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_utildefines.h" + /* ************************************************** */ diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index 3b82114fe35..e48ec8ac288 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -43,7 +43,7 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_global.h" #include "BKE_group.h" #include "BKE_library.h" diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 301588deaa2..58e3b4ba552 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -71,6 +71,7 @@ #include "BKE_packedFile.h" #include "BKE_scene.h" #include "BKE_node.h" +#include "BKE_utildefines.h" //XXX #include "BIF_editseq.h" diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c index b810e028b62..0df456a443d 100644 --- a/source/blender/blenkernel/intern/implicit.c +++ b/source/blender/blenkernel/intern/implicit.c @@ -43,7 +43,7 @@ #include "BKE_collision.h" #include "BKE_effect.h" #include "BKE_global.h" -#include "BKE_utildefines.h" + #define CLOTH_OPENMP_LIMIT 25 diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index cc890683d7b..b4dd81ce356 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -61,7 +61,7 @@ #include "BLI_dynstr.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_animsys.h" #include "BKE_action.h" diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index a4958940b62..328fb1b6a49 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -58,7 +58,7 @@ #include "BKE_library.h" #include "BKE_main.h" #include "BKE_object.h" -#include "BKE_utildefines.h" + #include "RNA_access.h" diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 15761dce4b3..be3ec62374f 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -61,7 +61,7 @@ #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_modifier.h" -#include "BKE_utildefines.h" + #include "BKE_deform.h" //XXX #include "BIF_editdeform.h" diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 6af7df67fa9..66b6d43d259 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -71,7 +71,7 @@ #include "BLI_dynstr.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_animsys.h" #include "BKE_context.h" #include "BKE_library.h" diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 887b1fe48a3..c22384a6bdc 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -56,7 +56,7 @@ #include "BKE_material.h" #include "BKE_mesh.h" #include "BKE_node.h" -#include "BKE_utildefines.h" + #include "GPU_material.h" diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index bd1c009adc7..6e48b922424 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -50,7 +50,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_global.h" #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 15ececd0d42..dc4838366c4 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -64,7 +64,7 @@ #include "BKE_curve.h" /* -- */ #include "BKE_object.h" -#include "BKE_utildefines.h" + EditMesh *BKE_mesh_get_editmesh(Mesh *me) { diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 79de12e1ce8..34a057788a2 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -47,7 +47,7 @@ #include "BKE_paint.h" #include "BKE_scene.h" #include "BKE_subsurf.h" -#include "BKE_utildefines.h" + #include "BKE_object.h" #include "CCGSubSurf.h" diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index fc7950e29c3..72466261e14 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -47,7 +47,7 @@ #include "BKE_nla.h" #include "BKE_global.h" #include "BKE_library.h" -#include "BKE_utildefines.h" + #include "RNA_access.h" #include "nla_private.h" diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index bd126ab12c2..7e9fe01e621 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -43,11 +43,10 @@ #include "BKE_animsys.h" #include "BKE_action.h" #include "BKE_fcurve.h" - +#include "BKE_utildefines.h" #include "PIL_time.h" - #include "CMP_node.h" #include "intern/CMP_util.h" /* stupid include path... */ diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index e564a32056f..c943b2fcfed 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -59,7 +59,7 @@ #include "BLI_pbvh.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_main.h" #include "BKE_global.h" diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 945131b60b2..853338d0722 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -33,7 +33,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_brush.h" #include "BKE_library.h" #include "BKE_paint.h" diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 27a19ecf1a5..018b882f7a2 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -62,7 +62,7 @@ #include "BKE_group.h" #include "BKE_main.h" #include "BKE_lattice.h" -#include "BKE_utildefines.h" + #include "BKE_displist.h" #include "BKE_particle.h" #include "BKE_object.h" diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 646f8080b5c..45016e2db73 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -74,7 +74,7 @@ #include "BKE_effect.h" #include "BKE_particle.h" #include "BKE_global.h" -#include "BKE_utildefines.h" + #include "BKE_DerivedMesh.h" #include "BKE_object.h" #include "BKE_material.h" diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 6f52803f6b2..317723aef7f 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -64,6 +64,7 @@ #include "BKE_smoke.h" #include "BKE_softbody.h" #include "BKE_utildefines.h" + #include "BIK_api.h" /* both in intern */ diff --git a/source/blender/blenkernel/intern/report.c b/source/blender/blenkernel/intern/report.c index 1dd27987cf8..a22b36b9524 100644 --- a/source/blender/blenkernel/intern/report.c +++ b/source/blender/blenkernel/intern/report.c @@ -33,7 +33,7 @@ #include "BKE_report.h" #include "BKE_global.h" /* G.background only */ -#include "BKE_utildefines.h" + #include <stdarg.h> #include <stdio.h> diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index ded32de48d3..94eed530ad6 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -67,7 +67,7 @@ #include "BKE_scene.h" #include "BKE_sequencer.h" #include "BKE_world.h" -#include "BKE_utildefines.h" + #include "BKE_sound.h" //XXX #include "BIF_previewrender.h" diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 4a3c80afaa8..5f25e419eec 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -57,6 +57,8 @@ #include "BKE_fcurve.h" #include "BKE_scene.h" #include "RNA_access.h" +#include "BKE_utildefines.h" + #include "RE_pipeline.h" #include <pthread.h> diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index ee39e639a99..753e31d565b 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -22,7 +22,7 @@ * * The Original Code is: all of this file. * - * Contributor(s): André Pinto + * Contributor(s): Andr Pinto * * ***** END GPL LICENSE BLOCK ***** */ @@ -47,7 +47,7 @@ #include "BKE_shrinkwrap.h" #include "BKE_DerivedMesh.h" #include "BKE_lattice.h" -#include "BKE_utildefines.h" + #include "BKE_deform.h" #include "BKE_mesh.h" #include "BKE_subsurf.h" diff --git a/source/blender/blenkernel/intern/sketch.c b/source/blender/blenkernel/intern/sketch.c index a81f49ddc58..06c6e0f197a 100644 --- a/source/blender/blenkernel/intern/sketch.c +++ b/source/blender/blenkernel/intern/sketch.c @@ -34,7 +34,7 @@ #include "BLI_utildefines.h" #include "BKE_sketch.h" -#include "BKE_utildefines.h" + #include "DNA_userdef_types.h" diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 41732ff3735..8039d729842 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -59,7 +59,7 @@ #include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_smoke.h" -#include "BKE_utildefines.h" + #include "DNA_customdata_types.h" #include "DNA_group_types.h" diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 02b3d858a5f..40fe71ded23 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -55,7 +55,7 @@ #include "BKE_paint.h" #include "BKE_scene.h" #include "BKE_subsurf.h" -#include "BKE_utildefines.h" + #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 8d73c0c32ae..5ae35aaa266 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -52,7 +52,7 @@ #include "BKE_library.h" #include "BKE_main.h" #include "BKE_text.h" -#include "BKE_utildefines.h" + #ifdef WITH_PYTHON #include "BPY_extern.h" diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index 0bfc0065b1a..014a15de1ef 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -43,7 +43,7 @@ #include "BKE_global.h" #include "BKE_main.h" #include "BKE_report.h" -#include "BKE_utildefines.h" + #include "BKE_writeavi.h" #include "AVI_avi.h" diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c index 625a9168271..eb1c66604f8 100644 --- a/source/blender/blenkernel/intern/writeframeserver.c +++ b/source/blender/blenkernel/intern/writeframeserver.c @@ -49,7 +49,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_global.h" #include "BKE_report.h" |