diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-07 21:36:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-07 21:36:47 +0300 |
commit | 8f21a43535cb200c0569566a1b012aec883aa53c (patch) | |
tree | e41eeff28b248000af473053c59990eb3497bf3a /source/blender/render/intern | |
parent | a601fd889331c319803daa7505c2c8016f15a47f (diff) |
split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h.
no functional changes.
Diffstat (limited to 'source/blender/render/intern')
30 files changed, 48 insertions, 18 deletions
diff --git a/source/blender/render/intern/raytrace/bvh.h b/source/blender/render/intern/raytrace/bvh.h index 133a3d4a005..c31d1213b99 100644 --- a/source/blender/render/intern/raytrace/bvh.h +++ b/source/blender/render/intern/raytrace/bvh.h @@ -31,6 +31,8 @@ #include "rayobject_rtbuild.h" #include "rayobject_hint.h" +#include "BLI_utildefines.h" + #include <assert.h> #ifdef __SSE__ diff --git a/source/blender/render/intern/raytrace/rayobject.cpp b/source/blender/render/intern/raytrace/rayobject.cpp index 6a7066eeb9b..4ca55f3dce7 100644 --- a/source/blender/render/intern/raytrace/rayobject.cpp +++ b/source/blender/render/intern/raytrace/rayobject.cpp @@ -28,11 +28,15 @@ */ #include <assert.h> -#include "BKE_utildefines.h" #include "BLI_math.h" +#include "BLI_utildefines.h" + +#include "BKE_utildefines.h" + #include "DNA_material_types.h" #include "RE_raytrace.h" + #include "render_types.h" #include "rayobject.h" #include "raycounter.h" diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp index 1c3cdd5919f..7d589c46d1f 100644 --- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp +++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp @@ -33,7 +33,10 @@ #include "rayobject_rtbuild.h" #include "MEM_guardedalloc.h" + #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/reorganize.h b/source/blender/render/intern/raytrace/reorganize.h index 1d923c92d6f..c8fbd1cfe94 100644 --- a/source/blender/render/intern/raytrace/reorganize.h +++ b/source/blender/render/intern/raytrace/reorganize.h @@ -32,6 +32,8 @@ #include <vector> #include <queue> +#include "BLI_utildefines.h" + #include "BKE_global.h" #ifdef _WIN32 diff --git a/source/blender/render/intern/raytrace/svbvh.h b/source/blender/render/intern/raytrace/svbvh.h index 055a71e3380..11511fccb89 100644 --- a/source/blender/render/intern/raytrace/svbvh.h +++ b/source/blender/render/intern/raytrace/svbvh.h @@ -33,6 +33,7 @@ #include "bvh.h" #include "BLI_memarena.h" +#include "BLI_utildefines.h" #include "BKE_global.h" #include <stdio.h> #include <algorithm> diff --git a/source/blender/render/intern/raytrace/vbvh.h b/source/blender/render/intern/raytrace/vbvh.h index 21c3c0b4c01..a5ca093de2a 100644 --- a/source/blender/render/intern/raytrace/vbvh.h +++ b/source/blender/render/intern/raytrace/vbvh.h @@ -31,7 +31,7 @@ #include <algorithm> #include "rayobject_rtbuild.h" #include "BLI_memarena.h" - +#include "BLI_utildefines.h" /* * VBVHNode represents a BVHNode with support for a variable number of childrens diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index a70641a3dae..42346f0d251 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -31,12 +31,11 @@ #include <string.h> #include <limits.h> - - #include "MEM_guardedalloc.h" #include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BLI_rand.h" #include "BLI_memarena.h" #include "BLI_ghash.h" diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index f7da13373d1..89eeea24217 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -34,6 +34,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" /* for rectcpy */ diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c index 1ab0e8f8042..a5eb73831b9 100644 --- a/source/blender/render/intern/source/imagetexture.c +++ b/source/blender/render/intern/source/imagetexture.c @@ -51,6 +51,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_utildefines.h" #include "BKE_global.h" diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index 26c68d0a167..e971e7913d7 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -40,8 +40,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_jitter.h" - - +#include "BLI_utildefines.h" #include "DNA_camera_types.h" #include "DNA_group_types.h" diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c index fb69519236a..a5a84caf787 100644 --- a/source/blender/render/intern/source/occlusion.c +++ b/source/blender/render/intern/source/occlusion.c @@ -40,6 +40,7 @@ #include "BLI_blenlib.h" #include "BLI_memarena.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_global.h" #include "BKE_scene.h" diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 83b61c31dd9..998f2489ab2 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -58,6 +58,7 @@ #include "BLI_blenlib.h" #include "BLI_rand.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "PIL_time.h" #include "IMB_imbuf.h" diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c index 768fc4ecacb..d562d596ace 100644 --- a/source/blender/render/intern/source/pixelshading.c +++ b/source/blender/render/intern/source/pixelshading.c @@ -27,14 +27,14 @@ #include <float.h> #include <math.h> #include <string.h> + #include "BLI_math.h" +#include "BLI_utildefines.h" /* External modules: */ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" - - #include "DNA_camera_types.h" #include "DNA_group_types.h" #include "DNA_material_types.h" diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index a5609390ef4..15279fea01d 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -32,6 +32,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_kdopbvh.h" +#include "BLI_utildefines.h" #include "BKE_DerivedMesh.h" #include "BKE_global.h" diff --git a/source/blender/render/intern/source/rayobject_blibvh.c b/source/blender/render/intern/source/rayobject_blibvh.c index d824719a2ac..9c5fbfed1bc 100644 --- a/source/blender/render/intern/source/rayobject_blibvh.c +++ b/source/blender/render/intern/source/rayobject_blibvh.c @@ -32,6 +32,7 @@ #include "BKE_utildefines.h" #include "BLI_kdopbvh.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "RE_raytrace.h" #include "render_types.h" #include "rayobject.h" diff --git a/source/blender/render/intern/source/rayobject_instance.c b/source/blender/render/intern/source/rayobject_instance.c index a8098d2e8ef..7366a07e0f7 100644 --- a/source/blender/render/intern/source/rayobject_instance.c +++ b/source/blender/render/intern/source/rayobject_instance.c @@ -30,7 +30,10 @@ #include "MEM_guardedalloc.h" #include "BKE_utildefines.h" + #include "BLI_math.h" +#include "BLI_utildefines.h" + #include "RE_raytrace.h" #include "rayobject.h" diff --git a/source/blender/render/intern/source/rayobject_octree.c b/source/blender/render/intern/source/rayobject_octree.c index 6d99d961e26..5a9bf835c3c 100644 --- a/source/blender/render/intern/source/rayobject_octree.c +++ b/source/blender/render/intern/source/rayobject_octree.c @@ -38,9 +38,10 @@ #include "DNA_material_types.h" -#include "BKE_utildefines.h" - #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 bde088167c9..9cdda4da52d 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -37,15 +37,16 @@ #include "DNA_material_types.h" #include "DNA_lamp_types.h" -#include "BKE_global.h" -#include "BKE_node.h" -#include "BKE_utildefines.h" - #include "BLI_blenlib.h" #include "BLI_cpu.h" #include "BLI_jitter.h" #include "BLI_math.h" #include "BLI_rand.h" +#include "BLI_utildefines.h" + +#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 4ee62bc5794..81c6d0ed9cd 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -41,6 +41,7 @@ #include "BLI_jitter.h" #include "BLI_rand.h" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_utildefines.h" diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c index 2da2f3633c3..db635ec5270 100644 --- a/source/blender/render/intern/source/renderdatabase.c +++ b/source/blender/render/intern/source/renderdatabase.c @@ -62,6 +62,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_memarena.h" diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c index 7d6edde2c0d..25bed1b4d10 100644 --- a/source/blender/render/intern/source/shadbuf.c +++ b/source/blender/render/intern/source/shadbuf.c @@ -42,6 +42,7 @@ #include "BLI_jitter.h" #include "BLI_memarena.h" #include "BLI_rand.h" +#include "BLI_utildefines.h" #include "PIL_time.h" diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c index e619eb6bf06..ef19d59f2c6 100644 --- a/source/blender/render/intern/source/shadeinput.c +++ b/source/blender/render/intern/source/shadeinput.c @@ -32,6 +32,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "DNA_curve_types.h" #include "DNA_group_types.h" diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 295428b7c0f..2a7f36482f7 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -30,8 +30,8 @@ #include <math.h> #include <string.h> - #include "BLI_math.h" +#include "BLI_utildefines.h" #include "BKE_colortools.h" #include "BKE_material.h" diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c index 4bccb46d3d8..e8ac1e5117d 100644 --- a/source/blender/render/intern/source/sss.c +++ b/source/blender/render/intern/source/sss.c @@ -49,8 +49,10 @@ #include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_memarena.h" + #include "PIL_time.h" #include "DNA_material_types.h" diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c index fbbeceeea2c..c1c0d2827b2 100644 --- a/source/blender/render/intern/source/strand.c +++ b/source/blender/render/intern/source/strand.c @@ -39,6 +39,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_memarena.h" diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 0be2f1719be..6283e7d1b94 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -30,11 +30,10 @@ #include <string.h> #include <math.h> - - #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_rand.h" +#include "BLI_utildefines.h" #include "DNA_texture_types.h" #include "DNA_object_types.h" diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c index ccdef6006d4..2813df3744f 100644 --- a/source/blender/render/intern/source/volume_precache.c +++ b/source/blender/render/intern/source/volume_precache.c @@ -37,6 +37,7 @@ #include "BLI_math.h" #include "BLI_threads.h" #include "BLI_voxel.h" +#include "BLI_utildefines.h" #include "PIL_time.h" diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c index 58ff7c5fa7e..b0aca038e72 100644 --- a/source/blender/render/intern/source/volumetric.c +++ b/source/blender/render/intern/source/volumetric.c @@ -37,6 +37,7 @@ #include "BLI_math.h" #include "BLI_rand.h" #include "BLI_voxel.h" +#include "BLI_utildefines.h" #include "RE_shader_ext.h" #include "RE_raytrace.h" diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c index 581dedfe655..2fba1091319 100644 --- a/source/blender/render/intern/source/voxeldata.c +++ b/source/blender/render/intern/source/voxeldata.c @@ -35,6 +35,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_voxel.h" +#include "BLI_utildefines.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index 1cdb93f0c1f..cab1f05c368 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -41,7 +41,7 @@ #include "BLI_blenlib.h" #include "BLI_jitter.h" #include "BLI_threads.h" - +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" |