From 2b7ca2304a9b17568fac57a0bceba72b9c9ab580 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 17 Feb 2012 18:59:41 +0000
Subject: unify include guard defines, __$FILENAME__

without the underscores these clogged up the namespace for autocompleation which was annoying.
---
 source/blender/render/intern/include/envmap.h                | 6 +++---
 source/blender/render/intern/include/gammaCorrectionTables.h | 4 ++--
 source/blender/render/intern/include/initrender.h            | 6 +++---
 source/blender/render/intern/include/occlusion.h             | 4 ++--
 source/blender/render/intern/include/pixelblending.h         | 6 +++---
 source/blender/render/intern/include/pixelshading.h          | 4 ++--
 source/blender/render/intern/include/pointdensity.h          | 6 +++---
 source/blender/render/intern/include/raycounter.h            | 4 ++--
 source/blender/render/intern/include/rayintersection.h       | 6 +++---
 source/blender/render/intern/include/rayobject.h             | 4 ++--
 source/blender/render/intern/include/render_result.h         | 6 +++---
 source/blender/render/intern/include/render_types.h          | 6 +++---
 source/blender/render/intern/include/rendercore.h            | 4 ++--
 source/blender/render/intern/include/renderdatabase.h        | 6 +++---
 source/blender/render/intern/include/renderpipeline.h        | 6 +++---
 source/blender/render/intern/include/shadbuf.h               | 6 +++---
 source/blender/render/intern/include/sss.h                   | 6 +++---
 source/blender/render/intern/include/strand.h                | 4 ++--
 source/blender/render/intern/include/sunsky.h                | 6 +++---
 source/blender/render/intern/include/texture.h               | 6 +++---
 source/blender/render/intern/include/voxeldata.h             | 6 +++---
 source/blender/render/intern/include/zbuf.h                  | 4 ++--
 22 files changed, 58 insertions(+), 58 deletions(-)

(limited to 'source/blender/render/intern/include')

diff --git a/source/blender/render/intern/include/envmap.h b/source/blender/render/intern/include/envmap.h
index 0133c08a6a7..24138884cd2 100644
--- a/source/blender/render/intern/include/envmap.h
+++ b/source/blender/render/intern/include/envmap.h
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef ENVMAP_EXT_H
-#define ENVMAP_EXT_H 
+#ifndef __ENVMAP_H__
+#define __ENVMAP_H__ 
 
 /**
  * Make environment maps for all objects in the scene that have an
@@ -48,5 +48,5 @@ struct TexResult;
 void make_envmaps(struct Render *re);
 int envmaptex(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres);
 
-#endif /* ENVMAP_EXT_H */
+#endif /* __ENVMAP_H__ */
 
diff --git a/source/blender/render/intern/include/gammaCorrectionTables.h b/source/blender/render/intern/include/gammaCorrectionTables.h
index 29ceef82c09..b41fc01eaaf 100644
--- a/source/blender/render/intern/include/gammaCorrectionTables.h
+++ b/source/blender/render/intern/include/gammaCorrectionTables.h
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef GAMMACORRECTIONTABLES_H
-#define GAMMACORRECTIONTABLES_H
+#ifndef __GAMMACORRECTIONTABLES_H__
+#define __GAMMACORRECTIONTABLES_H__
 
 /**
  * Initialise the gamma lookup tables
diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/include/initrender.h
index 17fa312a6cd..e4fb338771e 100644
--- a/source/blender/render/intern/include/initrender.h
+++ b/source/blender/render/intern/include/initrender.h
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef INITRENDER_H
-#define INITRENDER_H 
+#ifndef __INITRENDER_H__
+#define __INITRENDER_H__ 
 
 struct Object;
 
@@ -49,5 +49,5 @@ void initparts(Render *re);
 void freeparts(Render *re);
 
 
-#endif /* INITRENDER_H */
+#endif /* __INITRENDER_H__ */
 
diff --git a/source/blender/render/intern/include/occlusion.h b/source/blender/render/intern/include/occlusion.h
index 15581c8d7d4..78a1f8a1175 100644
--- a/source/blender/render/intern/include/occlusion.h
+++ b/source/blender/render/intern/include/occlusion.h
@@ -31,8 +31,8 @@
  */
 
 
-#ifndef OCCLUSION_H
-#define OCCLUSION_H
+#ifndef __OCCLUSION_H__
+#define __OCCLUSION_H__
 
 struct Render;
 struct ShadeInput;
diff --git a/source/blender/render/intern/include/pixelblending.h b/source/blender/render/intern/include/pixelblending.h
index 87a5ed07747..aa2698716e9 100644
--- a/source/blender/render/intern/include/pixelblending.h
+++ b/source/blender/render/intern/include/pixelblending.h
@@ -28,8 +28,8 @@
  */
 
 
-#ifndef PIXELBLENDING_EXT_H
-#define PIXELBLENDING_EXT_H 
+#ifndef __PIXELBLENDING_H__
+#define __PIXELBLENDING_H__ 
 
 
 /**
@@ -69,5 +69,5 @@ void addalphaUnderGammaFloat(float *doel, float *bron);
 
 
 
-#endif /* PIXELBLENDING_EXT_H */
+#endif /* __PIXELBLENDING_H__ */
 
diff --git a/source/blender/render/intern/include/pixelshading.h b/source/blender/render/intern/include/pixelshading.h
index 6f4b373f8d4..17032283540 100644
--- a/source/blender/render/intern/include/pixelshading.h
+++ b/source/blender/render/intern/include/pixelshading.h
@@ -34,8 +34,8 @@
 */
 
 
-#ifndef PIXELSHADING_H
-#define PIXELSHADING_H
+#ifndef __PIXELSHADING_H__
+#define __PIXELSHADING_H__
 
 /**
  * Render the pixel at (x,y) for object ap. Apply the jitter mask. 
diff --git a/source/blender/render/intern/include/pointdensity.h b/source/blender/render/intern/include/pointdensity.h
index 7ceb24e9ece..cc8fabda49c 100644
--- a/source/blender/render/intern/include/pointdensity.h
+++ b/source/blender/render/intern/include/pointdensity.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef POINTDENSITY_H
-#define POINTDENSITY_H 
+#ifndef __POINTDENSITY_H__
+#define __POINTDENSITY_H__ 
 
 /**
  * Make point density kd-trees for all point density textures in the scene
@@ -45,5 +45,5 @@ void make_pointdensities(struct Render *re);
 void free_pointdensities(struct Render *re);
 int pointdensitytex(struct Tex *tex, float *texvec, struct TexResult *texres);
 
-#endif /* POINTDENSITY_H */
+#endif /* __POINTDENSITY_H__ */
 
diff --git a/source/blender/render/intern/include/raycounter.h b/source/blender/render/intern/include/raycounter.h
index 20348f8d418..075a6337435 100644
--- a/source/blender/render/intern/include/raycounter.h
+++ b/source/blender/render/intern/include/raycounter.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef RE_RAYCOUNTER_H
-#define RE_RAYCOUNTER_H
+#ifndef __RAYCOUNTER_H__
+#define __RAYCOUNTER_H__
 
 //#define RE_RAYCOUNTER			/* enable counters per ray, useful for measuring raytrace structures performance */
 
diff --git a/source/blender/render/intern/include/rayintersection.h b/source/blender/render/intern/include/rayintersection.h
index 2c68421a8ee..934bf92db8f 100644
--- a/source/blender/render/intern/include/rayintersection.h
+++ b/source/blender/render/intern/include/rayintersection.h
@@ -31,8 +31,8 @@
  */
 
 
-#ifndef __RENDER_RAYINTERSECTION_H__
-#define __RENDER_RAYINTERSECTION_H__
+#ifndef __RAYINTERSECTION_H__
+#define __RAYINTERSECTION_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -123,5 +123,5 @@ typedef struct Isect {
 }
 #endif
 
-#endif /* __RENDER_RAYINTERSECTION_H__ */
+#endif /* __RAYINTERSECTION_H__ */
 
diff --git a/source/blender/render/intern/include/rayobject.h b/source/blender/render/intern/include/rayobject.h
index 3ca3bd63428..c93c4e1da63 100644
--- a/source/blender/render/intern/include/rayobject.h
+++ b/source/blender/render/intern/include/rayobject.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef RE_RAYOBJECT_H
-#define RE_RAYOBJECT_H
+#ifndef __RAYOBJECT_H__
+#define __RAYOBJECT_H__
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h
index 93cbc6fe9c9..3d73ee1e912 100644
--- a/source/blender/render/intern/include/render_result.h
+++ b/source/blender/render/intern/include/render_result.h
@@ -29,8 +29,8 @@
  *  \ingroup render
  */
 
-#ifndef RENDER_RESULT_H
-#define RENDER_RESULT_H
+#ifndef __RENDER_RESULT_H__
+#define __RENDER_RESULT_H__
 
 #define PASS_VECTOR_MAX	10000.0f
 
@@ -90,5 +90,5 @@ void render_result_rect_fill_zero(struct RenderResult *rr);
 void render_result_rect_get_pixels(struct RenderResult *rr, struct RenderData *rd,
 	unsigned int *rect, int rectx, int recty);
 
-#endif /* RENDER_RESULT_H */
+#endif /* __RENDER_RESULT_H__ */
 
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index f414be60b0a..886a6ce74f2 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -28,8 +28,8 @@
  */
 
 
-#ifndef RENDER_TYPES_H
-#define RENDER_TYPES_H
+#ifndef __RENDER_TYPES_H__
+#define __RENDER_TYPES_H__
 
 /* ------------------------------------------------------------------------- */
 /* exposed internal in render module only! */
@@ -628,5 +628,5 @@ typedef struct LampRen {
 #define R_ENV_TRANSFORMED	2
 #define R_TRANSFORMED		(1|2)
 
-#endif /* RENDER_TYPES_H */
+#endif /* __RENDER_TYPES_H__ */
 
diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h
index 08f73ccbe0d..496e2bb50a9 100644
--- a/source/blender/render/intern/include/rendercore.h
+++ b/source/blender/render/intern/include/rendercore.h
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef RENDERCORE_H
-#define RENDERCORE_H 
+#ifndef __RENDERCORE_H__
+#define __RENDERCORE_H__ 
 
 #include "render_types.h"
 
diff --git a/source/blender/render/intern/include/renderdatabase.h b/source/blender/render/intern/include/renderdatabase.h
index ebbbfb03f55..d11732f7da1 100644
--- a/source/blender/render/intern/include/renderdatabase.h
+++ b/source/blender/render/intern/include/renderdatabase.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef RENDERDATABASE_H
-#define RENDERDATABASE_H
+#ifndef __RENDERDATABASE_H__
+#define __RENDERDATABASE_H__
 
 struct Object;
 struct VlakRen;
@@ -144,5 +144,5 @@ void init_render_world(Render *re);
 void RE_Database_FromScene_Vectors(Render *re, struct Main *bmain, struct Scene *sce, unsigned int lay);
 
 
-#endif /* RENDERDATABASE_H */
+#endif /* __RENDERDATABASE_H__ */
 
diff --git a/source/blender/render/intern/include/renderpipeline.h b/source/blender/render/intern/include/renderpipeline.h
index 9a87cf84012..e713d4880d6 100644
--- a/source/blender/render/intern/include/renderpipeline.h
+++ b/source/blender/render/intern/include/renderpipeline.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef PIPELINE_H
-#define PIPELINE_H
+#ifndef __RENDERPIPELINE_H__
+#define __RENDERPIPELINE_H__
 
 struct Render;
 struct RenderLayer;
@@ -40,5 +40,5 @@ struct RenderResult;
 struct RenderLayer *render_get_active_layer(struct Render *re, struct RenderResult *rr);
 float panorama_pixel_rot(struct Render *re);
 
-#endif /* PIPELINE_H */
+#endif /* __RENDERPIPELINE_H__ */
 
diff --git a/source/blender/render/intern/include/shadbuf.h b/source/blender/render/intern/include/shadbuf.h
index a37af5abb4a..ddcfc555f7a 100644
--- a/source/blender/render/intern/include/shadbuf.h
+++ b/source/blender/render/intern/include/shadbuf.h
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef SHADBUF_EXT_H
-#define SHADBUF_EXT_H
+#ifndef __SHADBUF_H__
+#define __SHADBUF_H__
 
 #include "render_types.h"
 
@@ -114,5 +114,5 @@ typedef struct ISBData {
 	int minx, miny, rectx, recty;	/* copy from part disprect */
 } ISBData;
 
-#endif /* SHADBUF_EXT_H */
+#endif /* __SHADBUF_H__ */
 
diff --git a/source/blender/render/intern/include/sss.h b/source/blender/render/intern/include/sss.h
index 4e110da25dd..6a179d2f428 100644
--- a/source/blender/render/intern/include/sss.h
+++ b/source/blender/render/intern/include/sss.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef SSS_H
-#define SSS_H
+#ifndef __SSS_H__
+#define __SSS_H__
 
 /* Generic multiple scattering API */
 
@@ -64,5 +64,5 @@ void free_sss(struct Render *re);
 int sample_sss(struct Render *re, struct Material *mat, float *co, float *col);
 int sss_pass_done(struct Render *re, struct Material *mat);
 
-#endif /*SSS_H*/
+#endif /*__SSS_H__*/
 
diff --git a/source/blender/render/intern/include/strand.h b/source/blender/render/intern/include/strand.h
index 1cf34c7ad50..4403f68c982 100644
--- a/source/blender/render/intern/include/strand.h
+++ b/source/blender/render/intern/include/strand.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef STRAND_H
-#define STRAND_H 
+#ifndef __STRAND_H__
+#define __STRAND_H__ 
 
 struct StrandVert;
 struct StrandRen;
diff --git a/source/blender/render/intern/include/sunsky.h b/source/blender/render/intern/include/sunsky.h
index 8c0cbfd18e7..5076a1541af 100644
--- a/source/blender/render/intern/include/sunsky.h
+++ b/source/blender/render/intern/include/sunsky.h
@@ -29,8 +29,8 @@
  * and example code from Brian Smits, another author of that paper in 
  * http://www.cs.utah.edu/vissim/papers/sunsky/code/
  * */
-#ifndef SUNSKY_H_
-#define SUNSKY_H_
+#ifndef __SUNSKY_H__
+#define __SUNSKY_H__
 
 #define SPECTRUM_MAX_COMPONENTS     100
 #define SPECTRUM_START              350.0
@@ -146,4 +146,4 @@ void AtmospherePixleShader( struct SunSky* sunSky, float view[3], float s, float
  * */
 void ClipColor(float c[3]);
 
-#endif /*SUNSKY_H_*/
+#endif /*__SUNSKY_H__*/
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h
index a8d13077680..e5013ace1f0 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef TEXTURE_EXT_H
-#define TEXTURE_EXT_H
+#ifndef __TEXTURE_H__
+#define __TEXTURE_H__
 
 #define BRICONT                                                               \
 	texres->tin= (texres->tin-0.5f) * tex->contrast+tex->bright-0.5f;         \
@@ -85,5 +85,5 @@ int imagewraposa(struct Tex *tex, struct Image *ima, struct ImBuf *ibuf, const f
 int imagewrap(struct Tex *tex, struct Image *ima, struct ImBuf *ibuf, const float texvec[3], struct TexResult *texres);
 void image_sample(struct Image *ima, float fx, float fy, float dx, float dy, float *result);
 
-#endif /* TEXTURE_EXT_H */
+#endif /* __TEXTURE_H__ */
 
diff --git a/source/blender/render/intern/include/voxeldata.h b/source/blender/render/intern/include/voxeldata.h
index aa4a9fdb845..3d6280c5c28 100644
--- a/source/blender/render/intern/include/voxeldata.h
+++ b/source/blender/render/intern/include/voxeldata.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef VOXELDATA_H
-#define VOXELDATA_H 
+#ifndef __VOXELDATA_H__
+#define __VOXELDATA_H__ 
 
 struct Render;
 struct TexResult;
@@ -47,4 +47,4 @@ void make_voxeldata(struct Render *re);
 void free_voxeldata(struct Render *re);
 int voxeldatatex(struct Tex *tex, const float texvec[3], struct TexResult *texres);
 
-#endif /* VOXELDATA_H */
+#endif /* __VOXELDATA_H__ */
diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h
index c467c31b5a6..518b2f846d3 100644
--- a/source/blender/render/intern/include/zbuf.h
+++ b/source/blender/render/intern/include/zbuf.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef ZBUF_H
-#define ZBUF_H
+#ifndef __ZBUF_H__
+#define __ZBUF_H__
 
 struct RenderPart;
 struct RenderLayer;
-- 
cgit v1.2.3