diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-07 22:18:31 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-07 22:18:31 +0300 |
commit | 89c9aaaa25cc7ce60c305d8e30e1c008cb117cf1 (patch) | |
tree | ac9e9fc1a682129df4af48a3b9a2fb59e3e85fcf /source/blender/render | |
parent | 8f21a43535cb200c0569566a1b012aec883aa53c (diff) |
remove references to BKE_utildefines where its not needed.
- move GS() define into DNA_ID.h
- add BLI_utildefines as an automatic include with makesrna generated files.
Diffstat (limited to 'source/blender/render')
23 files changed, 27 insertions, 28 deletions
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" |