diff options
Diffstat (limited to 'source')
251 files changed, 221 insertions, 301 deletions
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c index 21bf73b56d9..8a929e1ebf7 100644 --- a/source/blender/blenfont/intern/blf_lang.c +++ b/source/blender/blenfont/intern/blf_lang.c @@ -38,7 +38,7 @@ #include "DNA_listBase.h" #include "DNA_vec_types.h" -#include "BKE_utildefines.h" + #include "BLI_blenlib.h" #include "BLI_linklist.h" /* linknode */ @@ -46,7 +46,7 @@ #ifdef __APPLE__ -#include "BKE_utildefines.h" + #endif #define DOMAIN_NAME "blender" diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h index 781de5e219e..aa421305d5c 100644 --- a/source/blender/blenkernel/BKE_utildefines.h +++ b/source/blender/blenkernel/BKE_utildefines.h @@ -79,12 +79,6 @@ /* bit-row */ #define BROW(min, max) (((max)>=31? 0xFFFFFFFF: (1<<(max+1))-1) - ((min)? ((1<<(min))-1):0) ) - -#ifdef GS -#undef GS -#endif -#define GS(a) (*((short *)(a))) - #define BMEMSET(mem, val, size) {unsigned int _i; char *_c = (char*) mem; for (_i=0; _i<size; _i++) *_c++ = val;} #endif // BKE_UTILDEFINES_H 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" diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index 85520c95829..4673462f58b 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -32,7 +32,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BLI_kdopbvh.h" #include "BLI_math.h" diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index 94cd162a961..f63302e3cee 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -52,7 +52,7 @@ //XXX #include "BIF_toolbox.h" #include "BKE_font.h" -#include "BKE_utildefines.h" + #include "DNA_vfont_types.h" #include "DNA_packedFile_types.h" diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c index 95beca0e97b..a96b2d20976 100644 --- a/source/blender/blenlib/intern/graph.c +++ b/source/blender/blenlib/intern/graph.c @@ -33,7 +33,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + static void testRadialSymmetry(BGraph *graph, BNode* root_node, RadialArc* ring, int total, float axis[3], float limit, int group); diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 98ba9b0b41f..fb90af873df 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -32,7 +32,7 @@ #include "BLI_memarena.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + /********************************** Polygons *********************************/ @@ -630,7 +630,7 @@ static int getLowestRoot(float a, float b, float c, float maxR, float* root) if (determinant >= 0.0f) { // calculate the two roots: (if determinant == 0 then - // x1==x2 but let’s disregard that slight optimization) + // x1==x2 but lets disregard that slight optimization) float sqrtD = (float)sqrt(determinant); float r1 = (-b - sqrtD) / (2.0f*a); float r2 = (-b + sqrtD) / (2.0f*a); diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 53d9f2b78e7..6da59fd4e81 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -91,6 +91,7 @@ #include "BLI_linklist.h" #include "BLI_storage_types.h" #include "BLI_string.h" + #include "BKE_utildefines.h" /* vars: */ diff --git a/source/blender/blenlib/intern/voxel.c b/source/blender/blenlib/intern/voxel.c index 64f7d7904b1..72a9c7d98ec 100644 --- a/source/blender/blenlib/intern/voxel.c +++ b/source/blender/blenlib/intern/voxel.c @@ -29,7 +29,7 @@ #include "BLI_voxel.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + BM_INLINE float D(float *data, int *res, int x, int y, int z) { diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index b3438590321..6f38dceccba 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -39,7 +39,7 @@ #define WIN32_SKIP_HKEY_PROTECTION // need to use HKEY #include "BLI_winstuff.h" -#include "BKE_utildefines.h" /* FILE_MAXDIR + FILE_MAXFILE */ + /* FILE_MAXDIR + FILE_MAXFILE */ int BLI_getInstallationDir( char * str ) { char dir[FILE_MAXDIR]; diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 76bc2577183..dd6d56572e8 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -141,7 +141,7 @@ Any case: direct data is ALWAYS after the lib block #include "BKE_node.h" #include "BKE_report.h" #include "BKE_sequencer.h" -#include "BKE_utildefines.h" // for defines +#include "BKE_utildefines.h" #include "BKE_modifier.h" #include "BKE_fcurve.h" #include "BKE_pointcache.h" 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" diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 72c20711863..dfaf251f4c5 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -59,7 +59,7 @@ #include "BKE_material.h" #include "BKE_node.h" #include "BKE_object.h" -#include "BKE_utildefines.h" + #include "BLI_threads.h" #include "BLI_blenlib.h" diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 61188b9ca0f..bff4287bd75 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -37,7 +37,7 @@ #include "MEM_guardedalloc.h" #include "BKE_global.h" -#include "BKE_utildefines.h" + #include "BLI_blenlib.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 33bde8651b1..6f8719c60d3 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -52,7 +52,7 @@ #include "BKE_node.h" #include "BKE_scene.h" #include "BKE_texture.h" -#include "BKE_utildefines.h" + #include "GPU_extensions.h" #include "GPU_material.h" diff --git a/source/blender/ikplugin/intern/ikplugin_api.c b/source/blender/ikplugin/intern/ikplugin_api.c index c3310e77ad6..1604f591bda 100644 --- a/source/blender/ikplugin/intern/ikplugin_api.c +++ b/source/blender/ikplugin/intern/ikplugin_api.c @@ -33,7 +33,7 @@ #include "BLI_math.h" #include "BKE_armature.h" -#include "BKE_utildefines.h" + #include "DNA_object_types.h" #include "DNA_action_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/ikplugin/intern/iksolver_plugin.c b/source/blender/ikplugin/intern/iksolver_plugin.c index 754db4de423..11be240ab76 100644 --- a/source/blender/ikplugin/intern/iksolver_plugin.c +++ b/source/blender/ikplugin/intern/iksolver_plugin.c @@ -36,7 +36,7 @@ #include "BKE_armature.h" #include "BKE_constraint.h" -#include "BKE_utildefines.h" + #include "DNA_object_types.h" #include "DNA_action_types.h" #include "DNA_constraint_types.h" diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 35a57ed13c7..45a8986f835 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -66,7 +66,7 @@ #include "DNA_userdef_types.h" -#include "BKE_utildefines.h" + #include "BKE_global.h" #include "BKE_depsgraph.h" diff --git a/source/blender/imbuf/intern/cache.c b/source/blender/imbuf/intern/cache.c index 484dac0d0e4..23f0dd87b1a 100644 --- a/source/blender/imbuf/intern/cache.c +++ b/source/blender/imbuf/intern/cache.c @@ -28,7 +28,7 @@ #include "BLI_memarena.h" #include "BLI_threads.h" -#include "BKE_utildefines.h" + #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index b2ab68b99d9..138212a622d 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -38,7 +38,7 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" #include "IMB_allocimbuf.h" -#include "BKE_utildefines.h" + #include "BKE_colortools.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/imbuf/intern/filter.c b/source/blender/imbuf/intern/filter.c index f1d15136fee..42f87049c2a 100644 --- a/source/blender/imbuf/intern/filter.c +++ b/source/blender/imbuf/intern/filter.c @@ -33,7 +33,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c index be2c932e3b9..eba32c73688 100644 --- a/source/blender/imbuf/intern/rectop.c +++ b/source/blender/imbuf/intern/rectop.c @@ -37,7 +37,7 @@ #include "IMB_imbuf.h" #include "IMB_allocimbuf.h" -#include "BKE_utildefines.h" + /* blend modes */ diff --git a/source/blender/imbuf/intern/rotate.c b/source/blender/imbuf/intern/rotate.c index ae46ae39882..d4e1a45f0fa 100644 --- a/source/blender/imbuf/intern/rotate.c +++ b/source/blender/imbuf/intern/rotate.c @@ -32,7 +32,7 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "MEM_guardedalloc.h" #include "imbuf.h" diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index 35cb7d9ff6d..4e5dc5923fe 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -51,7 +51,7 @@ #include "BLI_utildefines.h" #include "BKE_global.h" -#include "BKE_utildefines.h" + #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index d33d78d4f37..83561766a3c 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -199,6 +199,11 @@ typedef struct PreviewImage { #define ID_REAL_USERS(id) (((ID *)id)->us - ((((ID *)id)->flag & LIB_FAKEUSER) ? 1:0)) +#ifdef GS +#undef GS +#endif +#define GS(a) (*((short *)(a))) + /* id->flag: set frist 8 bits always at zero while reading */ #define LIB_LOCAL 0 #define LIB_EXTERN 1 diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 5112f1067f2..6d9c2ec16d3 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -2419,12 +2419,12 @@ static void rna_generate(BlenderRNA *brna, FILE *f, const char *filename, const fprintf(f, "#include \"DNA_scene_types.h\"\n"); fprintf(f, "#include \"BLI_blenlib.h\"\n\n"); + fprintf(f, "#include \"BLI_utildefines.h\"\n\n"); fprintf(f, "#include \"BKE_context.h\"\n"); fprintf(f, "#include \"BKE_library.h\"\n"); fprintf(f, "#include \"BKE_main.h\"\n"); fprintf(f, "#include \"BKE_report.h\"\n"); - fprintf(f, "#include \"BKE_utildefines.h\"\n\n"); fprintf(f, "#include \"RNA_define.h\"\n"); fprintf(f, "#include \"RNA_types.h\"\n"); diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 63edd69fb41..efef72913c9 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -70,8 +70,6 @@ EnumPropertyItem id_type_items[] = { #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - #include "BKE_idprop.h" #include "BKE_library.h" #include "BKE_animsys.h" diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 7c1308ece97..ee1ae025bd6 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -43,7 +43,7 @@ #include "BKE_idprop.h" #include "BKE_main.h" #include "BKE_report.h" -#include "BKE_utildefines.h" + #include "WM_api.h" diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index dc5e5699699..2fa93bcecdd 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -59,8 +59,6 @@ EnumPropertyItem actuator_type_items[] ={ #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - #include "BKE_sca.h" static StructRNA* rna_Actuator_refine(struct PointerRNA *ptr) diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 4516afed72a..90c072bcfcb 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -47,8 +47,6 @@ EnumPropertyItem keyingset_path_grouping_items[] = { #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - #include "BKE_animsys.h" static int rna_AnimData_action_editable(PointerRNA *ptr) diff --git a/source/blender/makesrna/intern/rna_animviz.c b/source/blender/makesrna/intern/rna_animviz.c index fd568363423..1fcd53d5d0f 100644 --- a/source/blender/makesrna/intern/rna_animviz.c +++ b/source/blender/makesrna/intern/rna_animviz.c @@ -38,8 +38,6 @@ #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - static PointerRNA rna_AnimViz_onion_skinning_get(PointerRNA *ptr) { return rna_pointer_inherit_refine(ptr, &RNA_AnimVizOnionSkinning, ptr->data); diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index cb7865c51f5..40755e0dfd1 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -39,8 +39,6 @@ #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_idprop.h" diff --git a/source/blender/makesrna/intern/rna_boid.c b/source/blender/makesrna/intern/rna_boid.c index ca6147e46a7..757952bb956 100644 --- a/source/blender/makesrna/intern/rna_boid.c +++ b/source/blender/makesrna/intern/rna_boid.c @@ -67,8 +67,6 @@ EnumPropertyItem boidruleset_type_items[] ={ #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_particle.h" diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 7cfe918eabd..60c28d8bae1 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -89,8 +89,6 @@ EnumPropertyItem brush_imagepaint_tool_items[] = { #include "RNA_access.h" -#include "BLI_utildefines.h" - #include "BKE_texture.h" #include "BKE_brush.h" #include "BKE_icons.h" diff --git a/source/blender/makesrna/intern/rna_camera.c b/source/blender/makesrna/intern/rna_camera.c index 72a9af515dd..b0d93bcd09a 100644 --- a/source/blender/makesrna/intern/rna_camera.c +++ b/source/blender/makesrna/intern/rna_camera.c @@ -36,8 +36,6 @@ #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - #include "BKE_object.h" /* only for rad/deg conversion! can remove later */ diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index 643b9979a44..2d2c9ab8a5b 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -41,8 +41,6 @@ #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - #include "BKE_context.h" #include "BKE_depsgraph.h" diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index 8eb1152d6d2..01b5c3a9793 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -40,8 +40,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" - #include "BKE_colortools.h" #include "BKE_depsgraph.h" #include "BKE_node.h" diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 11960d10d88..112526cec46 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -96,10 +96,6 @@ EnumPropertyItem constraint_ik_axisref_items[] ={ #ifdef RNA_RUNTIME -#include <stdio.h> - -#include "BLI_utildefines.h" - #include "BKE_animsys.h" #include "BKE_action.h" #include "BKE_constraint.h" diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 4fe7a1a4122..8b9166b919f 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -64,7 +64,6 @@ EnumPropertyItem curve_type_items[] = { #ifdef RNA_RUNTIME #include "BLI_math.h" -#include "BLI_utildefines.h" #include "DNA_object_types.h" diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index b5573e0044d..e71454ef9ec 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -98,8 +98,6 @@ static StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr) /* ****************************** */ -#include "BLI_utildefines.h" - #include "BKE_fcurve.h" #include "BKE_depsgraph.h" #include "BKE_animsys.h" diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c index 86164092d74..81b4b75aa03 100644 --- a/source/blender/makesrna/intern/rna_fluidsim.c +++ b/source/blender/makesrna/intern/rna_fluidsim.c @@ -40,8 +40,6 @@ #include "DNA_scene_types.h" #include "DNA_particle_types.h" -#include "BLI_utildefines.h" - #include "BKE_depsgraph.h" #include "BKE_fluidsim.h" #include "BKE_global.h" diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index 9e298f0e835..a104ae9de5c 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -37,8 +37,6 @@ #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - static int rna_GPencilLayer_active_frame_editable(PointerRNA *ptr) { bGPDlayer *gpl= (bGPDlayer *)ptr->data; diff --git a/source/blender/makesrna/intern/rna_group.c b/source/blender/makesrna/intern/rna_group.c index f3fdb9091b3..bd1b7c96998 100644 --- a/source/blender/makesrna/intern/rna_group.c +++ b/source/blender/makesrna/intern/rna_group.c @@ -35,8 +35,6 @@ #include "DNA_scene_types.h" #include "DNA_object_types.h" -#include "BLI_utildefines.h" - #include "BKE_group.h" #include "WM_api.h" diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 774c32ec67a..cc3c25fdb0e 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -48,8 +48,6 @@ static EnumPropertyItem image_source_items[]= { #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - #include "IMB_imbuf_types.h" static void rna_Image_animated_update(Main *bmain, Scene *scene, PointerRNA *ptr) diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c index 699b21e840e..4f7f32d72c0 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -40,7 +40,7 @@ #include "BKE_image.h" #include "BKE_packedFile.h" #include "BKE_main.h" -#include "BKE_utildefines.h" + #include "BKE_global.h" /* grr: G.main->name */ #include "IMB_imbuf.h" diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 1f74097a831..d4021dc1cec 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -42,8 +42,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" - #include "BKE_animsys.h" #include "BKE_depsgraph.h" #include "BKE_key.h" diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index e0d79c5a852..68ff80f83dc 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_lamp.c @@ -38,8 +38,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" - #include "BKE_depsgraph.h" #include "BKE_main.h" #include "BKE_texture.h" diff --git a/source/blender/makesrna/intern/rna_lattice.c b/source/blender/makesrna/intern/rna_lattice.c index cc998dd49aa..de09d9605cd 100644 --- a/source/blender/makesrna/intern/rna_lattice.c +++ b/source/blender/makesrna/intern/rna_lattice.c @@ -38,8 +38,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_utildefines.h" - #include "BKE_depsgraph.h" #include "BKE_lattice.h" #include "BKE_main.h" diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 08af56f20e9..3ab7d05cd8a 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -59,8 +59,6 @@ #include "BKE_font.h" #include "BKE_node.h" -#include "BLI_utildefines.h" - #include "DNA_armature_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index ca8c9eb26ba..0fdb42f9146 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -55,8 +55,6 @@ static EnumPropertyItem prop_texture_coordinates_items[] = { #include "DNA_node_types.h" -#include "BLI_utildefines.h" - #include "BKE_depsgraph.h" #include "BKE_main.h" #include "BKE_material.h" diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index bc1281638ca..26136eeaf3e 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -41,13 +41,12 @@ #include "BLI_editVert.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BKE_customdata.h" #include "BKE_depsgraph.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_utildefines.h" + #include "ED_mesh.h" /* XXX Bad level call */ diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c index 60c8b1a2693..f1d41d86695 100644 --- a/source/blender/makesrna/intern/rna_meta.c +++ b/source/blender/makesrna/intern/rna_meta.c @@ -35,7 +35,6 @@ #ifdef RNA_RUNTIME #include "BLI_math.h" -#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 2f5d6870aed..11b0e8f995e 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -39,7 +39,6 @@ #include "MEM_guardedalloc.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_bmesh.h" /* For BevelModifierData */ diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index 7756d0e7e51..15c8608e523 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -40,8 +40,6 @@ #include <math.h> /* needed for some of the validation stuff... */ -#include "BLI_utildefines.h" - #include "BKE_animsys.h" #include "BKE_nla.h" diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index d33d433c32f..6cb5a074c03 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -29,8 +29,6 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "BLI_utildefines.h" - #include "rna_internal.h" #include "DNA_action_types.h" @@ -145,7 +143,6 @@ EnumPropertyItem object_type_curve_items[] = { #include "BKE_deform.h" #include "BLI_editVert.h" /* for EditMesh->mat_nr */ -#include "BLI_utildefines.h" #include "ED_mesh.h" #include "ED_object.h" diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 29f4582b0b8..945d0dbb123 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -59,7 +59,6 @@ #include "BKE_modifier.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "DNA_mesh_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index f817e03f150..fb8617bc626 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -84,8 +84,6 @@ EnumPropertyItem empty_vortex_shape_items[] = { #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" - #include "DNA_modifier_types.h" #include "DNA_texture_types.h" diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 6a5578ef62b..a10f3fa34b8 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -97,7 +97,6 @@ EnumPropertyItem part_hair_ren_as_items[] = { #include "BLI_math.h" #include "BLI_listbase.h" -#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_cloth.h" diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index 6ff73770e7a..7b1a46dd6e2 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -50,7 +50,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BKE_context.h" diff --git a/source/blender/makesrna/intern/rna_property.c b/source/blender/makesrna/intern/rna_property.c index f76ad8627e0..b7ae1229c4a 100644 --- a/source/blender/makesrna/intern/rna_property.c +++ b/source/blender/makesrna/intern/rna_property.c @@ -34,8 +34,6 @@ #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - #include "BKE_property.h" static StructRNA* rna_GameProperty_refine(struct PointerRNA *ptr) diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index 29e8b2ed31a..5d1fc51a70f 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -30,9 +30,10 @@ #include "rna_internal.h" - #include "RE_pipeline.h" +#include "BKE_utildefines.h" + #ifdef RNA_RUNTIME #include "MEM_guardedalloc.h" @@ -42,7 +43,6 @@ #include "BKE_context.h" #include "BKE_report.h" - /* RenderEngine */ static RenderEngineType internal_render_type = { diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index ed7b88383f7..23c045ba4f9 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -157,7 +157,6 @@ EnumPropertyItem image_type_items[] = { #include "BLI_threads.h" #include "BLI_editVert.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index 3852e7a225d..e891d64d514 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -37,7 +37,6 @@ #include "BKE_utildefines.h" #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_depsgraph.h" diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 477121b79c4..ae13e5c68d9 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -51,8 +51,6 @@ static EnumPropertyItem particle_edit_hair_brush_items[] = { #ifdef RNA_RUNTIME #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" - #include "BKE_context.h" #include "BKE_pointcache.h" #include "BKE_particle.h" diff --git a/source/blender/makesrna/intern/rna_sensor.c b/source/blender/makesrna/intern/rna_sensor.c index 011e6a44980..47a619f661a 100644 --- a/source/blender/makesrna/intern/rna_sensor.c +++ b/source/blender/makesrna/intern/rna_sensor.c @@ -57,8 +57,6 @@ EnumPropertyItem sensor_type_items[] ={ #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - #include "BKE_sca.h" static StructRNA* rna_Sensor_refine(struct PointerRNA *ptr) diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 36934d81611..233ffd06188 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -46,8 +46,6 @@ #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - static float to_dB(float x) { return logf(x * x + 1e-30f) * 4.34294480f; diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index 6e48ff005d5..fc1584c7a0f 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -43,8 +43,6 @@ #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_particle.h" diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d573439c7de..4a98d71a76a 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -107,7 +107,6 @@ EnumPropertyItem viewport_shade_items[] = { #include "DNA_screen_types.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BKE_animsys.h" #include "BKE_brush.h" diff --git a/source/blender/makesrna/intern/rna_text.c b/source/blender/makesrna/intern/rna_text.c index 31c372b493a..66046939350 100644 --- a/source/blender/makesrna/intern/rna_text.c +++ b/source/blender/makesrna/intern/rna_text.c @@ -39,8 +39,6 @@ #ifdef RNA_RUNTIME -#include "BLI_utildefines.h" - int text_file_modified(Text *text); static void rna_Text_filename_get(PointerRNA *ptr, char *value) diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index f99355c0db9..7ad59795732 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -74,8 +74,6 @@ EnumPropertyItem texture_type_items[] = { #include "RNA_access.h" -#include "BLI_utildefines.h" - #include "BKE_depsgraph.h" #include "BKE_image.h" #include "BKE_texture.h" diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index ace35d6fb0a..0c26741f06c 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -58,7 +58,6 @@ EnumPropertyItem operator_context_items[] = { #include "RNA_access.h" #include "BLI_dynstr.h" -#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_report.h" diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 4793e7aace6..90124e5f376 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -40,8 +40,6 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" - #include "BKE_sound.h" #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 5b5d94e3b93..a7870243afc 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -297,8 +297,6 @@ EnumPropertyItem wm_report_items[] = { #include <assert.h> -#include "BLI_utildefines.h" - #include "WM_api.h" #include "BKE_idprop.h" diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c index 53eba7cce8d..1358964a92b 100644 --- a/source/blender/makesrna/intern/rna_world.c +++ b/source/blender/makesrna/intern/rna_world.c @@ -39,8 +39,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" - #include "BKE_depsgraph.h" #include "BKE_main.h" #include "BKE_texture.h" diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 4f62a4d435d..d06ec92d4df 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -37,7 +37,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_lattice.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index d4ede54d1df..112618a2bd6 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -34,7 +34,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index fa494c28031..c3400a6541d 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -36,11 +36,11 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_deform.h" #include "BKE_DerivedMesh.h" #include "BKE_modifier.h" -#include "BKE_utildefines.h" + #include "depsgraph_private.h" diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 864a2cbbcb1..a0566d32c73 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -38,7 +38,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cloth.h" #include "BKE_cdderivedmesh.h" #include "BKE_global.h" diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 46dbb0d9a6e..bf324030424 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -39,7 +39,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_collision.h" #include "BKE_cdderivedmesh.h" #include "BKE_global.h" diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index 686e32ac5d5..b1a5965cbe3 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -37,7 +37,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_lattice.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index f2af4f42532..7903e1adb47 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -35,7 +35,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index b61467fbd59..931865409cb 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -36,7 +36,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" #include "BKE_texture.h" diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 08f38ed0fc5..105e4777e87 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -41,7 +41,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" #include "BKE_particle.h" diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index ff2bb3c27ec..015b4b649d4 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -47,7 +47,7 @@ #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_scene.h" -#include "BKE_utildefines.h" + #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c index 6c8f1fd81cb..bbb88ba09e3 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim.c +++ b/source/blender/modifiers/intern/MOD_fluidsim.c @@ -36,7 +36,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 3f44b0617b8..adf19882419 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -41,7 +41,7 @@ #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" #include "BKE_deform.h" -#include "BKE_utildefines.h" + #include "depsgraph_private.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index e25d75be5bf..136998dbc78 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -36,7 +36,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_lattice.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index 4e7e857b2fa..6df57bf372e 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -36,7 +36,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_global.h" #include "BKE_mesh.h" diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index b5c38491ecd..c07bd10d6fa 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -40,7 +40,7 @@ #include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_deform.h" -#include "BKE_utildefines.h" + #include "MEM_guardedalloc.h" #include "depsgraph_private.h" diff --git a/source/blender/modifiers/intern/MOD_none.c b/source/blender/modifiers/intern/MOD_none.c index 79017823795..cc27d3b659b 100644 --- a/source/blender/modifiers/intern/MOD_none.c +++ b/source/blender/modifiers/intern/MOD_none.c @@ -34,7 +34,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -#include "BKE_utildefines.h" + #include "BLI_utildefines.h" diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 4ac1e5b2f19..f0e7699c292 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -44,7 +44,7 @@ #include "BKE_modifier.h" #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "BKE_utildefines.h" + #include "depsgraph_private.h" diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index d47bfaed043..9b77a904887 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -36,7 +36,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_material.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 46868abc163..c340a472504 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -38,7 +38,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "depsgraph_private.h" diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index 30e8a877144..5466d240dd2 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -36,7 +36,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.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 7a617003dff..a7de27c0bf6 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -34,7 +34,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" #include "BKE_shrinkwrap.h" diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index b42d4266b04..003b206f9bc 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -41,7 +41,7 @@ #include "BKE_modifier.h" #include "BKE_deform.h" #include "BKE_shrinkwrap.h" -#include "BKE_utildefines.h" + #include "depsgraph_private.h" diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index 5eeb7374f72..4ec6e82a7dd 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -41,7 +41,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_modifier.h" #include "BKE_smoke.h" diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index 633ac8c4b28..bc04b253cec 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -38,7 +38,7 @@ #include "BKE_cdderivedmesh.h" #include "BKE_particle.h" #include "BKE_deform.h" -#include "BKE_utildefines.h" + #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_softbody.c b/source/blender/modifiers/intern/MOD_softbody.c index 04c11651214..24af10fde2b 100644 --- a/source/blender/modifiers/intern/MOD_softbody.c +++ b/source/blender/modifiers/intern/MOD_softbody.c @@ -34,7 +34,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_particle.h" #include "BKE_softbody.h" diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 1c1d9eb0279..013ca7c231f 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -40,7 +40,7 @@ #include "BKE_mesh.h" #include "BKE_particle.h" #include "BKE_deform.h" -#include "BKE_utildefines.h" + #include "MOD_modifiertypes.h" diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index 94dc2273e70..1238c891f33 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -37,7 +37,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "BKE_scene.h" #include "BKE_subsurf.h" diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index d546ad444f4..d68ba84d58b 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -37,7 +37,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_cdderivedmesh.h" #include "MOD_modifiertypes.h" diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index 0b92794051c..036ae276a7b 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -41,7 +41,7 @@ #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" #include "BKE_displist.h" -#include "BKE_utildefines.h" + #include "BKE_modifier.h" #include "MOD_util.h" diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 7480e3e8c83..3f43924d6a2 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -40,7 +40,7 @@ #include "BLI_uvproject.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_DerivedMesh.h" #include "MOD_modifiertypes.h" diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index b4978da9bc1..69c9f1165ce 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -38,7 +38,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_DerivedMesh.h" #include "BKE_object.h" #include "BKE_deform.h" diff --git a/source/blender/nodes/intern/CMP_util.h b/source/blender/nodes/intern/CMP_util.h index 9703f00b92c..1f91ee8a457 100644 --- a/source/blender/nodes/intern/CMP_util.h +++ b/source/blender/nodes/intern/CMP_util.h @@ -60,7 +60,7 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_texture.h" -#include "BKE_utildefines.h" + #include "BKE_library.h" #include "BKE_object.h" diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c b/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c index a548893905a..7975c081880 100644 --- a/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c +++ b/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c @@ -38,7 +38,7 @@ #include "DNA_text_types.h" #include "BKE_text.h" -#include "BKE_utildefines.h" + // XXX #if 0 diff --git a/source/blender/nodes/intern/SHD_util.h b/source/blender/nodes/intern/SHD_util.h index 5e5e431966c..147291e380a 100644 --- a/source/blender/nodes/intern/SHD_util.h +++ b/source/blender/nodes/intern/SHD_util.h @@ -52,7 +52,7 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_texture.h" -#include "BKE_utildefines.h" + #include "BKE_library.h" #include "../SHD_node.h" diff --git a/source/blender/nodes/intern/TEX_util.h b/source/blender/nodes/intern/TEX_util.h index 2d5dcbea2af..38edfabd346 100644 --- a/source/blender/nodes/intern/TEX_util.h +++ b/source/blender/nodes/intern/TEX_util.h @@ -51,7 +51,7 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_texture.h" -#include "BKE_utildefines.h" + #include "BKE_library.h" #include "../SHD_node.h" diff --git a/source/blender/python/generic/IDProp.c b/source/blender/python/generic/IDProp.c index 801b9b8e6b8..7bf7f06f989 100644 --- a/source/blender/python/generic/IDProp.c +++ b/source/blender/python/generic/IDProp.c @@ -30,7 +30,7 @@ #include "BLI_utildefines.h" #include "BKE_idprop.h" -#include "BKE_utildefines.h" + #define USE_STRING_COERCE diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c index 1c9a38cf150..e72f2136ee5 100644 --- a/source/blender/python/generic/bgl.c +++ b/source/blender/python/generic/bgl.c @@ -37,7 +37,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + static char Method_Buffer_doc[] = "(type, dimensions, [template]) - Create a new Buffer object\n\n\ diff --git a/source/blender/python/generic/blf_py_api.c b/source/blender/python/generic/blf_py_api.c index 3d645ab8482..0c0bf1a680d 100644 --- a/source/blender/python/generic/blf_py_api.c +++ b/source/blender/python/generic/blf_py_api.c @@ -29,7 +29,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + static char py_blf_position_doc[] = ".. function:: position(fontid, x, y, z)\n" diff --git a/source/blender/python/generic/bpy_internal_import.c b/source/blender/python/generic/bpy_internal_import.c index 99fca64238c..a1b99e12e94 100644 --- a/source/blender/python/generic/bpy_internal_import.c +++ b/source/blender/python/generic/bpy_internal_import.c @@ -43,7 +43,7 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" /* UNUSED */ + /* UNUSED */ #include "BKE_text.h" /* txt_to_buf */ #include "BKE_main.h" #include "BKE_global.h" /* grr, only for G.main->name */ diff --git a/source/blender/python/generic/mathutils.c b/source/blender/python/generic/mathutils.c index 137e27f948a..2e01dbe4cde 100644 --- a/source/blender/python/generic/mathutils.c +++ b/source/blender/python/generic/mathutils.c @@ -74,7 +74,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + //-------------------------DOC STRINGS --------------------------- static char M_Mathutils_doc[] = diff --git a/source/blender/python/generic/mathutils_color.c b/source/blender/python/generic/mathutils_color.c index 07838d3d938..bc82e11915e 100644 --- a/source/blender/python/generic/mathutils_color.c +++ b/source/blender/python/generic/mathutils_color.c @@ -27,7 +27,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #define COLOR_SIZE 3 diff --git a/source/blender/python/generic/mathutils_euler.c b/source/blender/python/generic/mathutils_euler.c index ae0923f544e..69237922666 100644 --- a/source/blender/python/generic/mathutils_euler.c +++ b/source/blender/python/generic/mathutils_euler.c @@ -31,7 +31,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #ifndef int32_t #include "BLO_sys_types.h" diff --git a/source/blender/python/generic/mathutils_geometry.c b/source/blender/python/generic/mathutils_geometry.c index 1764dbc330b..9280dc4093c 100644 --- a/source/blender/python/generic/mathutils_geometry.c +++ b/source/blender/python/generic/mathutils_geometry.c @@ -38,7 +38,7 @@ #include "BLI_utildefines.h" #include "BKE_displist.h" -#include "BKE_utildefines.h" + #include "BKE_curve.h" #define SWAP_FLOAT(a,b,tmp) tmp=a; a=b; b=tmp diff --git a/source/blender/python/generic/mathutils_matrix.c b/source/blender/python/generic/mathutils_matrix.c index 6994ace0f30..b67d4c54a7d 100644 --- a/source/blender/python/generic/mathutils_matrix.c +++ b/source/blender/python/generic/mathutils_matrix.c @@ -31,7 +31,7 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + /* matrix vector callbacks */ int mathutils_matrix_vector_cb_index= -1; diff --git a/source/blender/python/generic/mathutils_quat.c b/source/blender/python/generic/mathutils_quat.c index d6053f3fae4..36fb0ad66bd 100644 --- a/source/blender/python/generic/mathutils_quat.c +++ b/source/blender/python/generic/mathutils_quat.c @@ -31,7 +31,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #define QUAT_SIZE 4 diff --git a/source/blender/python/generic/mathutils_vector.c b/source/blender/python/generic/mathutils_vector.c index d2319c0e38e..3d80f6bade4 100644 --- a/source/blender/python/generic/mathutils_vector.c +++ b/source/blender/python/generic/mathutils_vector.c @@ -31,7 +31,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #define MAX_DIMENSIONS 4 /* Swizzle axes get packed into a single value that is used as a closure. Each diff --git a/source/blender/python/generic/noise.c b/source/blender/python/generic/noise.c index 860ba8edf21..f266a666274 100644 --- a/source/blender/python/generic/noise.c +++ b/source/blender/python/generic/noise.c @@ -42,7 +42,7 @@ #include "DNA_texture_types.h" -#include "BKE_utildefines.h" + /*-----------------------------------------*/ /* 'mersenne twister' random number generator */ diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index b6f92c63cb8..f287a69e3bb 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -37,7 +37,7 @@ #include "BLI_bpath.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_global.h" /* XXX, G.main only */ #include "MEM_guardedalloc.h" diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c index 682986befef..0f6fd3f6415 100644 --- a/source/blender/python/intern/bpy_app.c +++ b/source/blender/python/intern/bpy_app.c @@ -27,7 +27,7 @@ #include "BLI_path_util.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_blender.h" #include "BKE_global.h" #include "structseq.h" diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index c01263a7e25..3c76e1a703f 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -44,7 +44,7 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_context.h" #include "BKE_text.h" #include "BKE_font.h" /* only for utf8towchar */ diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index ce63d58559f..dd3a49ad8b1 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -28,7 +28,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "RNA_define.h" /* for defining our own rna */ #include "RNA_enum_types.h" diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index d9b2915c2c4..a95aa62b310 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -37,7 +37,7 @@ #include "RNA_define.h" /* RNA_def_property_free_identifier */ #include "MEM_guardedalloc.h" -#include "BKE_utildefines.h" + #include "BKE_idcode.h" #include "BKE_context.h" #include "BKE_global.h" /* evil G.* */ diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c index 7973cbbc5f8..6d4cc035ece 100644 --- a/source/blender/python/intern/bpy_rna_callback.c +++ b/source/blender/python/intern/bpy_rna_callback.c @@ -29,7 +29,7 @@ #include "BLI_utildefines.h" #include "DNA_screen_types.h" -#include "BKE_utildefines.h" + #include "BKE_context.h" #include "ED_space_api.h" diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 4d92f2ac8d1..d1c9e949963 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -32,7 +32,6 @@ #include "DNA_listBase.h" #include "DNA_vec_types.h" -#include "BKE_utildefines.h" #include "RNA_types.h" struct bNodeTree; diff --git a/source/blender/render/intern/raytrace/rayobject.cpp b/source/blender/render/intern/raytrace/rayobject.cpp index 4ca55f3dce7..c267b89fc2c 100644 --- a/source/blender/render/intern/raytrace/rayobject.cpp +++ b/source/blender/render/intern/raytrace/rayobject.cpp @@ -22,7 +22,7 @@ * * The Original Code is: all of this file. * - * Contributor(s): André Pinto. + * Contributor(s): Andr Pinto. * * ***** END GPL LICENSE BLOCK ***** */ @@ -31,7 +31,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "DNA_material_types.h" diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp index 7d589c46d1f..79bb3b9260f 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp @@ -22,7 +22,7 @@ * * The Original Code is: all of this file. * - * Contributor(s): André Pinto. + * Contributor(s): Andr Pinto. * * ***** END GPL LICENSE BLOCK ***** */ @@ -37,7 +37,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + static bool selected_node(RTBuilder::Object *node) { diff --git a/source/blender/render/intern/raytrace/rayobject_vbvh.cpp b/source/blender/render/intern/raytrace/rayobject_vbvh.cpp index de1e6d349be..b2104a2d557 100644 --- a/source/blender/render/intern/raytrace/rayobject_vbvh.cpp +++ b/source/blender/render/intern/raytrace/rayobject_vbvh.cpp @@ -22,7 +22,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 @@ int tot_hints = 0; #include "BLI_memarena.h" #include "MEM_guardedalloc.h" #include "BKE_global.h" -#include "BKE_utildefines.h" + #include "BLI_math.h" #include "reorganize.h" diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 42346f0d251..15c5bb3b86d 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -91,7 +91,7 @@ #include "BKE_scene.h" #include "BKE_subsurf.h" #include "BKE_texture.h" -#include "BKE_utildefines.h" + #include "BKE_world.h" #include "PIL_time.h" diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index 89eeea24217..55f7433da96 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -49,7 +49,7 @@ #include "BKE_main.h" #include "BKE_image.h" // BKE_write_ibuf #include "BKE_texture.h" -#include "BKE_utildefines.h" + diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c index a5eb73831b9..3a8270a757e 100644 --- a/source/blender/render/intern/source/imagetexture.c +++ b/source/blender/render/intern/source/imagetexture.c @@ -53,7 +53,7 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_global.h" #include "BKE_main.h" #include "BKE_image.h" diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index e971e7913d7..f54b7e2a43f 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -49,7 +49,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_utildefines.h" + #include "BKE_global.h" #include "BKE_material.h" #include "BKE_object.h" diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c index a5a84caf787..8661d0d89a0 100644 --- a/source/blender/render/intern/source/occlusion.c +++ b/source/blender/render/intern/source/occlusion.c @@ -44,7 +44,7 @@ #include "BKE_global.h" #include "BKE_scene.h" -#include "BKE_utildefines.h" + #include "RE_shader_ext.h" diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c index d562d596ace..74b59c881bb 100644 --- a/source/blender/render/intern/source/pixelshading.c +++ b/source/blender/render/intern/source/pixelshading.c @@ -48,7 +48,7 @@ #include "BKE_global.h" #include "BKE_material.h" #include "BKE_texture.h" -#include "BKE_utildefines.h" + /* own module */ #include "render_types.h" diff --git a/source/blender/render/intern/source/rayobject_blibvh.c b/source/blender/render/intern/source/rayobject_blibvh.c index 9c5fbfed1bc..fa5c32a8e8d 100644 --- a/source/blender/render/intern/source/rayobject_blibvh.c +++ b/source/blender/render/intern/source/rayobject_blibvh.c @@ -22,14 +22,14 @@ * * The Original Code is: all of this file. * - * Contributor(s): André Pinto. + * Contributor(s): Andr Pinto. * * ***** END GPL LICENSE BLOCK ***** */ #include <assert.h> #include "MEM_guardedalloc.h" -#include "BKE_utildefines.h" + #include "BLI_kdopbvh.h" #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/render/intern/source/rayobject_instance.c b/source/blender/render/intern/source/rayobject_instance.c index 7366a07e0f7..d7b4beb8023 100644 --- a/source/blender/render/intern/source/rayobject_instance.c +++ b/source/blender/render/intern/source/rayobject_instance.c @@ -22,14 +22,14 @@ * * The Original Code is: all of this file. * - * Contributor(s): André Pinto. + * Contributor(s): Andr Pinto. * * ***** END GPL LICENSE BLOCK ***** */ #include <assert.h> #include "MEM_guardedalloc.h" -#include "BKE_utildefines.h" + #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/render/intern/source/rayobject_octree.c b/source/blender/render/intern/source/rayobject_octree.c index 5a9bf835c3c..2637643989e 100644 --- a/source/blender/render/intern/source/rayobject_octree.c +++ b/source/blender/render/intern/source/rayobject_octree.c @@ -41,7 +41,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "rayobject.h" diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 9cdda4da52d..e1e0828bdd2 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -46,7 +46,7 @@ #include "BKE_global.h" #include "BKE_node.h" -#include "BKE_utildefines.h" + #include "PIL_time.h" diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 81c6d0ed9cd..d955043b1f1 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -43,7 +43,7 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "DNA_image_types.h" #include "DNA_lamp_types.h" diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c index db635ec5270..8f28419b9af 100644 --- a/source/blender/render/intern/source/renderdatabase.c +++ b/source/blender/render/intern/source/renderdatabase.c @@ -58,7 +58,7 @@ #include <string.h> #include "MEM_guardedalloc.h" -#include "BKE_utildefines.h" + #include "BLI_math.h" #include "BLI_blenlib.h" diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c index 25bed1b4d10..8dd07fad022 100644 --- a/source/blender/render/intern/source/shadbuf.c +++ b/source/blender/render/intern/source/shadbuf.c @@ -35,7 +35,7 @@ #include "BKE_global.h" #include "BKE_scene.h" -#include "BKE_utildefines.h" + #include "BLI_math.h" #include "BLI_blenlib.h" diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c index ef19d59f2c6..8bf2a24cab2 100644 --- a/source/blender/render/intern/source/shadeinput.c +++ b/source/blender/render/intern/source/shadeinput.c @@ -41,7 +41,7 @@ #include "DNA_material_types.h" #include "BKE_colortools.h" -#include "BKE_utildefines.h" + #include "BKE_node.h" /* local include */ diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 2a7f36482f7..7993abc85a1 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -36,7 +36,7 @@ #include "BKE_colortools.h" #include "BKE_material.h" #include "BKE_texture.h" -#include "BKE_utildefines.h" + #include "DNA_group_types.h" #include "DNA_lamp_types.h" diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c index e8ac1e5117d..44c89f8cbd5 100644 --- a/source/blender/render/intern/source/sss.c +++ b/source/blender/render/intern/source/sss.c @@ -63,7 +63,7 @@ #include "BKE_material.h" #include "BKE_node.h" #include "BKE_scene.h" -#include "BKE_utildefines.h" + /* this module */ #include "render_types.h" diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c index c1c0d2827b2..099bf76f40b 100644 --- a/source/blender/render/intern/source/strand.c +++ b/source/blender/render/intern/source/strand.c @@ -45,7 +45,7 @@ #include "BKE_DerivedMesh.h" #include "BKE_key.h" -#include "BKE_utildefines.h" + #include "render_types.h" #include "initrender.h" diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 6283e7d1b94..1706d63064c 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -51,7 +51,7 @@ #include "BKE_image.h" #include "BKE_node.h" #include "BKE_plugin_types.h" -#include "BKE_utildefines.h" + #include "BKE_global.h" #include "BKE_main.h" diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index cab1f05c368..a3d3a65cccc 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -53,7 +53,7 @@ #include "BKE_global.h" #include "BKE_material.h" -#include "BKE_utildefines.h" + #include "RE_render_ext.h" diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index efa09865c87..1b5d390fd1a 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -43,7 +43,7 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_utildefines.h" + #include "GHOST_C-api.h" diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 097286e3d9e..0cf3522eaf3 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -51,7 +51,7 @@ #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" -#include "BKE_utildefines.h" + #include "BKE_sound.h" #include "ED_fileselect.h" diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index b2319eb376f..518f7c4997a 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -73,7 +73,7 @@ #include "BKE_report.h" #include "BKE_sound.h" #include "BKE_texture.h" -#include "BKE_utildefines.h" + #include "BLO_readfile.h" #include "BLO_writefile.h" diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index e0c21e038be..3c27a71537b 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -40,7 +40,7 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_utildefines.h" + #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 89a7598038a..19bb92d72e0 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -52,7 +52,7 @@ #include "BKE_main.h" #include "BKE_mball.h" #include "BKE_report.h" -#include "BKE_utildefines.h" + #include "BKE_packedFile.h" #include "BKE_sequencer.h" /* free seq clipboard */ #include "BKE_material.h" /* clear_matcopybuf */ diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index d6d6fc47e4f..7d67245d077 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -45,7 +45,7 @@ #include "BKE_library.h" #include "BKE_main.h" #include "BKE_screen.h" -#include "BKE_utildefines.h" + #include "RNA_access.h" #include "RNA_enum_types.h" diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index a815451e483..605da96acea 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -70,7 +70,7 @@ #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" /* BKE_ST_MAXNAME */ -#include "BKE_utildefines.h" + #include "BKE_idcode.h" #include "BIF_gl.h" diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index aa665ea5aef..c08df0ccd75 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -41,7 +41,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index aa7146cd86f..db427ea68d1 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -48,7 +48,7 @@ #include "BKE_library.h" #include "BKE_global.h" #include "BKE_main.h" -#include "BKE_utildefines.h" + #include "BIF_gl.h" diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index c9d85e6b48f..e5179e8926f 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -77,7 +77,7 @@ extern "C" { #include "BKE_global.h" #include "BKE_report.h" -#include "BKE_utildefines.h" + //XXX #include "BIF_screen.h" //XXX #include "BIF_scrarea.h" diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp index 12b150554a8..ac35007129a 100644 --- a/source/gameengine/Converter/BL_ActionActuator.cpp +++ b/source/gameengine/Converter/BL_ActionActuator.cpp @@ -48,7 +48,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" #include "MT_Matrix4x4.h" -#include "BKE_utildefines.h" + #include "BKE_action.h" #include "FloatValue.h" #include "PyObjectPlus.h" diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp index 362a3bea8b9..be42b80f916 100644 --- a/source/gameengine/Converter/BL_ArmatureObject.cpp +++ b/source/gameengine/Converter/BL_ArmatureObject.cpp @@ -38,7 +38,7 @@ #include "BIK_api.h" #include "BKE_action.h" #include "BKE_armature.h" -#include "BKE_utildefines.h" + #include "BKE_constraint.h" #include "GEN_Map.h" #include "GEN_HashedPtr.h" diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index d8e00d5af3d..3cdc688f55d 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -126,7 +126,7 @@ #include "DNA_object_force.h" #include "MEM_guardedalloc.h" -#include "BKE_utildefines.h" + #include "BKE_key.h" #include "BKE_mesh.h" #include "MT_Point3.h" diff --git a/source/gameengine/Converter/BL_ModifierDeformer.cpp b/source/gameengine/Converter/BL_ModifierDeformer.cpp index 92690e2f842..5eb25b05567 100644 --- a/source/gameengine/Converter/BL_ModifierDeformer.cpp +++ b/source/gameengine/Converter/BL_ModifierDeformer.cpp @@ -62,7 +62,7 @@ extern "C"{ #include "BKE_lattice.h" #include "BKE_modifier.h" } - #include "BKE_utildefines.h" + #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp index ccd7dc6f745..4f6e07206dd 100644 --- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp +++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp @@ -48,7 +48,7 @@ #include "BLI_blenlib.h" #include "BLI_math.h" #include "MT_Matrix4x4.h" -#include "BKE_utildefines.h" + #include "FloatValue.h" #include "PyObjectPlus.h" diff --git a/source/gameengine/Converter/BL_ShapeDeformer.cpp b/source/gameengine/Converter/BL_ShapeDeformer.cpp index 54a3a5e2cd3..a5fd797852f 100644 --- a/source/gameengine/Converter/BL_ShapeDeformer.cpp +++ b/source/gameengine/Converter/BL_ShapeDeformer.cpp @@ -55,7 +55,7 @@ extern "C"{ #include "BKE_lattice.h" } - #include "BKE_utildefines.h" + #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/gameengine/Converter/BL_SkinDeformer.cpp b/source/gameengine/Converter/BL_SkinDeformer.cpp index e4a3bd3c288..3bac525d765 100644 --- a/source/gameengine/Converter/BL_SkinDeformer.cpp +++ b/source/gameengine/Converter/BL_SkinDeformer.cpp @@ -50,7 +50,7 @@ extern "C"{ #include "BKE_lattice.h" } - #include "BKE_utildefines.h" + #include "BLI_blenlib.h" #include "BLI_math.h" |