diff options
Diffstat (limited to 'source/blender/render')
33 files changed, 0 insertions, 153 deletions
diff --git a/source/blender/render/extern/include/render.h b/source/blender/render/extern/include/render.h index a7aa4b95e43..972134f8be7 100644 --- a/source/blender/render/extern/include/render.h +++ b/source/blender/render/extern/include/render.h @@ -44,15 +44,10 @@ #include "BKE_osa_types.h" #include "DNA_material_types.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef __cplusplus extern "C" { #endif - /* For #undefs of stupid windows defines */ #ifdef WIN32 #include "BLI_winstuff.h" diff --git a/source/blender/render/extern/include/render_types.h b/source/blender/render/extern/include/render_types.h index 1829262519d..2f33ae686a5 100644 --- a/source/blender/render/extern/include/render_types.h +++ b/source/blender/render/extern/include/render_types.h @@ -35,17 +35,11 @@ #include "DNA_scene_types.h" #include "DNA_world_types.h" -/* ------------------------------------------------------------------------- */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif /* Definitely weird: this equals 1<<21... so wtf?*/ #define MAXVERT (2<<20) #define MAXVLAK (2<<20) - /* This is needed to not let VC choke on near and far... old * proprietary MS extensions... */ #ifdef WIN32 diff --git a/source/blender/render/intern/include/RE_DummyShadowBuffer.h b/source/blender/render/intern/include/RE_DummyShadowBuffer.h index e41651c21c4..2522943fff2 100644 --- a/source/blender/render/intern/include/RE_DummyShadowBuffer.h +++ b/source/blender/render/intern/include/RE_DummyShadowBuffer.h @@ -35,10 +35,6 @@ #include "RE_ShadowBuffer.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - struct LampRen; class RE_DummyShadowBuffer : public RE_ShadowBuffer { diff --git a/source/blender/render/intern/include/RE_ShadowBuffer.h b/source/blender/render/intern/include/RE_ShadowBuffer.h index 36e719a6736..c501b3b1b82 100644 --- a/source/blender/render/intern/include/RE_ShadowBuffer.h +++ b/source/blender/render/intern/include/RE_ShadowBuffer.h @@ -35,10 +35,6 @@ #include <iostream.h> -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - struct ShadBuf; struct LampRen; diff --git a/source/blender/render/intern/include/RE_basicShadowBuffer.h b/source/blender/render/intern/include/RE_basicShadowBuffer.h index 79f5ffd1ab4..2bf9fcd1ff0 100644 --- a/source/blender/render/intern/include/RE_basicShadowBuffer.h +++ b/source/blender/render/intern/include/RE_basicShadowBuffer.h @@ -35,10 +35,6 @@ #include "RE_ShadowBuffer.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - struct LampRen; struct Lamp; diff --git a/source/blender/render/intern/include/RE_callbacks.h b/source/blender/render/intern/include/RE_callbacks.h index 8a53923cb8b..159eaa84ca4 100644 --- a/source/blender/render/intern/include/RE_callbacks.h +++ b/source/blender/render/intern/include/RE_callbacks.h @@ -34,10 +34,6 @@ #ifndef RE_CALLBACKS_H #define RE_CALLBACKS_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/render/intern/include/edgeRender.h b/source/blender/render/intern/include/edgeRender.h index 63b0ab1c99d..4d75d812711 100644 --- a/source/blender/render/intern/include/edgeRender.h +++ b/source/blender/render/intern/include/edgeRender.h @@ -35,12 +35,6 @@ #ifndef EDGERENDER_H #define EDGERENDER_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -/* ------------------------------------------------------------------------- */ - /** * Add edges to <targetbuf>, which is of size <iw> by <ih>. Use <osanr> * samples, and intensity <i>. <compat> indicates an extra shift in the diff --git a/source/blender/render/intern/include/envmap.h b/source/blender/render/intern/include/envmap.h index 89ec76a9f08..de5c0de974d 100644 --- a/source/blender/render/intern/include/envmap.h +++ b/source/blender/render/intern/include/envmap.h @@ -35,13 +35,6 @@ #ifndef ENVMAP_EXT_H #define ENVMAP_EXT_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -/* no types!!! */ -/* #include "envmap_types.h" */ - /** * Make environment maps for all objects in the scene that have an * environment map as texture. diff --git a/source/blender/render/intern/include/errorHandler.h b/source/blender/render/intern/include/errorHandler.h index 4878ba571a5..fb980fa255a 100644 --- a/source/blender/render/intern/include/errorHandler.h +++ b/source/blender/render/intern/include/errorHandler.h @@ -35,11 +35,6 @@ #ifndef ERRORHANDLER_H #define ERRORHANDLER_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -/* ------------------------------------------------------------------------- */ /* error codes */ enum RE_RENDER_ERROR { RE_NO_ERROR, diff --git a/source/blender/render/intern/include/gammaCorrectionTables.h b/source/blender/render/intern/include/gammaCorrectionTables.h index 2bef629582d..8df743e468d 100644 --- a/source/blender/render/intern/include/gammaCorrectionTables.h +++ b/source/blender/render/intern/include/gammaCorrectionTables.h @@ -35,11 +35,6 @@ #ifndef GAMMACORRECTIONTABLES_H #define GAMMACORRECTIONTABLES_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - - /* Default gamma. For most CRTs, gamma ranges from 2.2 to 2.5 (Foley), so */ /* 2.35 seems appropriate enough. Experience teaches a different number */ /* though. Old blender: 2.0. It might be nice to make this a slider */ diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/include/initrender.h index 79f376aa10c..06c5f032c7d 100644 --- a/source/blender/render/intern/include/initrender.h +++ b/source/blender/render/intern/include/initrender.h @@ -40,10 +40,6 @@ #include "DNA_effect_types.h" /* for PartEff type */ #include "render_types.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /* Functions */ void init_def_material(void); diff --git a/source/blender/render/intern/include/jitter.h b/source/blender/render/intern/include/jitter.h index 93cef086b75..beae4af0a40 100644 --- a/source/blender/render/intern/include/jitter.h +++ b/source/blender/render/intern/include/jitter.h @@ -35,10 +35,6 @@ #ifndef JITTER_H #define JITTER_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/render/intern/include/old_zbuffer_types.h b/source/blender/render/intern/include/old_zbuffer_types.h index 8280fdf6c77..4adf5f047ba 100644 --- a/source/blender/render/intern/include/old_zbuffer_types.h +++ b/source/blender/render/intern/include/old_zbuffer_types.h @@ -34,12 +34,6 @@ #ifndef OLD_ZBUFFER_TYPES_H #define OLD_ZBUFFER_TYPES_H "$Id$" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -/* ------------------------------------------------------------------------- */ - typedef struct PixStr { struct PixStr *next; diff --git a/source/blender/render/intern/include/outerRenderLoop.h b/source/blender/render/intern/include/outerRenderLoop.h index fb46475d70d..1c0faf666ae 100644 --- a/source/blender/render/intern/include/outerRenderLoop.h +++ b/source/blender/render/intern/include/outerRenderLoop.h @@ -35,10 +35,6 @@ #ifndef OUTERRENDERLOOP_H #define OUTERRENDERLOOP_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /** * Outer loop for rendering a single picture. */ diff --git a/source/blender/render/intern/include/pixelblending.h b/source/blender/render/intern/include/pixelblending.h index 316f6dc34dd..04fc037865f 100644 --- a/source/blender/render/intern/include/pixelblending.h +++ b/source/blender/render/intern/include/pixelblending.h @@ -42,11 +42,6 @@ /* own include */ #include "pixelblending_types.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - - /** * Samples pixel, depending on R.osa setting */ diff --git a/source/blender/render/intern/include/pixelblending_types.h b/source/blender/render/intern/include/pixelblending_types.h index 18cd1e0bd70..dac9924494f 100644 --- a/source/blender/render/intern/include/pixelblending_types.h +++ b/source/blender/render/intern/include/pixelblending_types.h @@ -36,12 +36,6 @@ #ifndef PIXELBLENDING_TYPES_H #define PIXELBLENDING_TYPES_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -/* #include "blender.h" */ - /* Threshold for a 'full' pixel: pixels with alpha above this level are */ /* considered opaque This is the decimal value for 0xFFF0 / 0xFFFF */ #define RE_FULL_COLOUR_FLOAT 0.9998 diff --git a/source/blender/render/intern/include/pixelshading.h b/source/blender/render/intern/include/pixelshading.h index 45669e8b121..3df3067f0a5 100644 --- a/source/blender/render/intern/include/pixelshading.h +++ b/source/blender/render/intern/include/pixelshading.h @@ -37,15 +37,8 @@ #ifndef PIXELSHADING_H #define PIXELSHADING_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -/* ------------------------------------------------------------------------- */ - #include "render.h" #include "vanillaRenderPipe_types.h" -/* ------------------------------------------------------------------------- */ /** * Render the pixel at (x,y) for object ap. Apply the jitter mask. diff --git a/source/blender/render/intern/include/renderHelp.h b/source/blender/render/intern/include/renderHelp.h index 89ace11fa1e..318b538d510 100644 --- a/source/blender/render/intern/include/renderHelp.h +++ b/source/blender/render/intern/include/renderHelp.h @@ -35,10 +35,6 @@ #ifndef RENDERHELP_EXT_H #define RENDERHELP_EXT_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/render/intern/include/renderPreAndPost.h b/source/blender/render/intern/include/renderPreAndPost.h index 7fef4b2e68e..59315868010 100644 --- a/source/blender/render/intern/include/renderPreAndPost.h +++ b/source/blender/render/intern/include/renderPreAndPost.h @@ -35,10 +35,6 @@ #ifndef RENDERPREANDPOST_H #define RENDERPREANDPOST_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - void prepareScene(void); void finalizeScene(void); void doClipping( void (*projectfunc)(float *, float *) ); diff --git a/source/blender/render/intern/include/render_intern.h b/source/blender/render/intern/include/render_intern.h index df0692df0c6..25302ad97bd 100644 --- a/source/blender/render/intern/include/render_intern.h +++ b/source/blender/render/intern/include/render_intern.h @@ -33,10 +33,6 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /* XXX, should die, no good reason to write * regular (non-file related) endian dependant * code. diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h index 1e0cd77b5c7..8f414936cad 100644 --- a/source/blender/render/intern/include/rendercore.h +++ b/source/blender/render/intern/include/rendercore.h @@ -36,10 +36,6 @@ #define RENDERCORE_H #include "render_types.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - struct HaloRen; float mistfactor(float *co); /* dist en hoogte, return alpha */ diff --git a/source/blender/render/intern/include/rendercore_int.h b/source/blender/render/intern/include/rendercore_int.h index 7c0e402a0b3..45b881fe27f 100644 --- a/source/blender/render/intern/include/rendercore_int.h +++ b/source/blender/render/intern/include/rendercore_int.h @@ -38,10 +38,6 @@ #include "zbuf_types.h" #include "render_types.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /* float CookTorr(float *n, float *l, float *v, int hard); */ void do_lamphalo_tex(LampRen *lar, float *p1, float *p2, float *intens); void spothalo(struct LampRen *lar, float *view, float *intens); diff --git a/source/blender/render/intern/include/shadbuf.h b/source/blender/render/intern/include/shadbuf.h index 6db4aebee7e..81ec34397cc 100644 --- a/source/blender/render/intern/include/shadbuf.h +++ b/source/blender/render/intern/include/shadbuf.h @@ -35,10 +35,6 @@ #ifndef SHADBUF_EXT_H #define SHADBUF_EXT_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "render_types.h" #ifdef __cplusplus diff --git a/source/blender/render/intern/include/shadowBuffer.h b/source/blender/render/intern/include/shadowBuffer.h index ae1f1b6f83c..46b24573fa8 100644 --- a/source/blender/render/intern/include/shadowBuffer.h +++ b/source/blender/render/intern/include/shadowBuffer.h @@ -33,10 +33,6 @@ #ifndef SHADOWBUFFER_H #define SHADOWBUFFER_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index c10e7a61851..5cf2c077926 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -36,13 +36,6 @@ #define TEXTURE_EXT_H "$Id$" #define TEXTURE_EXT_H "Copyright (C) 2001 NaN Technologies B.V. -/* no types!!! */ -/* #include "texture_types.h" */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - struct Tex; struct MTex; struct HaloRen; diff --git a/source/blender/render/intern/include/vanillaRenderPipe.h b/source/blender/render/intern/include/vanillaRenderPipe.h index a20e9a98687..1ace0c23610 100644 --- a/source/blender/render/intern/include/vanillaRenderPipe.h +++ b/source/blender/render/intern/include/vanillaRenderPipe.h @@ -37,10 +37,6 @@ #include "vanillaRenderPipe_types.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /** * Render pipeline with all kinds of extras. * status-------------------------\/ diff --git a/source/blender/render/intern/include/vanillaRenderPipe_int.h b/source/blender/render/intern/include/vanillaRenderPipe_int.h index e825d4a2189..980befae66f 100644 --- a/source/blender/render/intern/include/vanillaRenderPipe_int.h +++ b/source/blender/render/intern/include/vanillaRenderPipe_int.h @@ -38,10 +38,6 @@ #include "vanillaRenderPipe_types.h" #include "zbufferdatastruct_types.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /** * Z buffer initializer, for new pipeline. * <LI> diff --git a/source/blender/render/intern/include/vanillaRenderPipe_types.h b/source/blender/render/intern/include/vanillaRenderPipe_types.h index a0e1d04554b..cf4f2ffb289 100644 --- a/source/blender/render/intern/include/vanillaRenderPipe_types.h +++ b/source/blender/render/intern/include/vanillaRenderPipe_types.h @@ -35,10 +35,6 @@ #ifndef VANILLARENDERPIPE_TYPES_H #define VANILLARENDERPIPE_TYPES_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /* Render defines */ #define RE_MAX_OSA_COUNT 16 /* The max. number of possible oversamples */ #define RE_MAX_FACES_PER_PIXEL 500 /* max. nr of faces rendered behind one */ diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h index 10e00415d44..fdfa5b19abe 100644 --- a/source/blender/render/intern/include/zbuf.h +++ b/source/blender/render/intern/include/zbuf.h @@ -36,10 +36,6 @@ #ifndef ZBUF_H #define ZBUF_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/render/intern/include/zbuf_int.h b/source/blender/render/intern/include/zbuf_int.h index 3d442daca1d..367162be10e 100644 --- a/source/blender/render/intern/include/zbuf_int.h +++ b/source/blender/render/intern/include/zbuf_int.h @@ -40,10 +40,6 @@ #include "render_types.h" #include "zbuf_types.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /** * Convert a homogenous coordinate to a z buffer coordinate. The * function makes use of Zmulx, Zmuly, the x and y scale factors for diff --git a/source/blender/render/intern/include/zbuf_types.h b/source/blender/render/intern/include/zbuf_types.h index fa3e5cdb9e0..b5ad9c75902 100644 --- a/source/blender/render/intern/include/zbuf_types.h +++ b/source/blender/render/intern/include/zbuf_types.h @@ -36,10 +36,6 @@ #ifndef ZBUF_TYPES_H #define ZBUF_TYPES_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/render/intern/include/zbufferdatastruct.h b/source/blender/render/intern/include/zbufferdatastruct.h index f5bd2a409c7..790cce2cb77 100644 --- a/source/blender/render/intern/include/zbufferdatastruct.h +++ b/source/blender/render/intern/include/zbufferdatastruct.h @@ -37,10 +37,6 @@ #include "zbufferdatastruct_types.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /** * Set memory and counters for a fresh z buffer */ diff --git a/source/blender/render/intern/include/zbufferdatastruct_types.h b/source/blender/render/intern/include/zbufferdatastruct_types.h index 35351a63869..0607f19bbc9 100644 --- a/source/blender/render/intern/include/zbufferdatastruct_types.h +++ b/source/blender/render/intern/include/zbufferdatastruct_types.h @@ -35,10 +35,6 @@ #ifndef ZBUFFERDATASTRUCT_TYPES_H #define ZBUFFERDATASTRUCT_TYPES_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #define RE_ZBUFLEN 64 /* number of lines in the accumulation buffer */ /** |