code cleanup: header cleanup

16 files changed, 47 insertions, 60 deletions

diff --git a/source/blender/render/intern/include/gammaCorrectionTables.h b/source/blender/render/intern/include/gammaCorrectionTables.h
index 0df4248612b..68bb15f7f4c 100644
--- a/source/blender/render/intern/include/gammaCorrectionTables.h
+++ b/source/blender/render/intern/include/gammaCorrectionTables.h
@@ -1,7 +1,4 @@
 /*
- * gammacorrectiontables.h
- *
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -28,14 +25,13 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#ifndef __GAMMACORRECTIONTABLES_H__
+#define __GAMMACORRECTIONTABLES_H__
+
 /** \file blender/render/intern/include/gammaCorrectionTables.h
  *  \ingroup render
  */
 
-
-#ifndef __GAMMACORRECTIONTABLES_H__
-#define __GAMMACORRECTIONTABLES_H__
-
 /**
  * Initialize the gamma lookup tables
  */
diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/include/initrender.h
index d206b157948..7917fd66cfa 100644
--- a/source/blender/render/intern/include/initrender.h
+++ b/source/blender/render/intern/include/initrender.h
@@ -1,7 +1,4 @@
 /*
- * initrender_ext.h
- *
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
diff --git a/source/blender/render/intern/include/occlusion.h b/source/blender/render/intern/include/occlusion.h
index 78a1f8a1175..2f3ac2a7bff 100644
--- a/source/blender/render/intern/include/occlusion.h
+++ b/source/blender/render/intern/include/occlusion.h
@@ -1,5 +1,4 @@
-/* 
- *
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h
index 3585f243448..a66165d4680 100644
--- a/source/blender/render/intern/include/rendercore.h
+++ b/source/blender/render/intern/include/rendercore.h
@@ -1,7 +1,4 @@
 /*
- * rendercore_ext.h
- *
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -28,14 +25,13 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#ifndef __RENDERCORE_H__
+#define __RENDERCORE_H__ 
+
 /** \file blender/render/intern/include/rendercore.h
  *  \ingroup render
  */
 
-
-#ifndef __RENDERCORE_H__
-#define __RENDERCORE_H__ 
-
 #include "render_types.h"
 
 
diff --git a/source/blender/render/intern/include/shadbuf.h b/source/blender/render/intern/include/shadbuf.h
index 4b3595a009f..5cde8e5106a 100644
--- a/source/blender/render/intern/include/shadbuf.h
+++ b/source/blender/render/intern/include/shadbuf.h
@@ -1,7 +1,4 @@
 /*
- * shadbuf_ext.h
- *
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -28,14 +25,13 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#ifndef __SHADBUF_H__
+#define __SHADBUF_H__
+
 /** \file blender/render/intern/include/shadbuf.h
  *  \ingroup render
  */
 
-
-#ifndef __SHADBUF_H__
-#define __SHADBUF_H__
-
 #include "render_types.h"
 
 struct ObjectRen;
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h
index e5013ace1f0..679bd7bcdbf 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -1,7 +1,4 @@
 /*
- * texture_ext.h
- *
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
diff --git a/source/blender/render/intern/raytrace/rayobject_internal.h b/source/blender/render/intern/raytrace/rayobject_internal.h
index 8c8e432b6bd..3f768e5adcb 100644
--- a/source/blender/render/intern/raytrace/rayobject_internal.h
+++ b/source/blender/render/intern/raytrace/rayobject_internal.h
@@ -1,10 +1,37 @@
-/** \file blender/render/intern/raytrace/rayobject_internal.h
- *  \ingroup render
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2009 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): André Pinto.
+ *
+ * ***** END GPL LICENSE BLOCK *****
  */
 
 #ifndef __RAYOBJECT_INTERNAL_H__
 #define __RAYOBJECT_INTERNAL_H__
 
+/** \file blender/render/intern/raytrace/rayobject_internal.h
+ *  \ingroup render
+ */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c
index f8ada97e493..da7e4335f7d 100644
--- a/source/blender/render/intern/source/envmap.c
+++ b/source/blender/render/intern/source/envmap.c
@@ -1,5 +1,4 @@
-/* 
- *
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -28,7 +27,6 @@
  *  \ingroup render
  */
 
-
 #include <math.h>
 #include <string.h>
 
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index d8888cb4acc..b3c7a565d55 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -1,5 +1,4 @@
-/*  
- *
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
diff --git a/source/blender/render/intern/source/gammaCorrectionTables.c b/source/blender/render/intern/source/gammaCorrectionTables.c
index c0e69323745..2613d04165a 100644
--- a/source/blender/render/intern/source/gammaCorrectionTables.c
+++ b/source/blender/render/intern/source/gammaCorrectionTables.c
@@ -1,7 +1,4 @@
 /*
- * Jitter offset table
- *
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c
index 2bcc71d1d48..d454ea60705 100644
--- a/source/blender/render/intern/source/imagetexture.c
+++ b/source/blender/render/intern/source/imagetexture.c
@@ -1,6 +1,4 @@
 /*
- *
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -29,9 +27,6 @@
  *  \ingroup render
  */
 
-
-
-
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c
index f5c2b70a290..a1cee6637f4 100644
--- a/source/blender/render/intern/source/occlusion.c
+++ b/source/blender/render/intern/source/occlusion.c
@@ -1,5 +1,4 @@
-/* 
- *
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -30,7 +29,6 @@
  *  \ingroup render
  */
 
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index ff45f991dc0..57c39a03c06 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1,5 +1,4 @@
-/*  
- *
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -30,7 +29,6 @@
  *  \ingroup render
  */
 
-
 #include <math.h>
 #include <limits.h>
 #include <string.h>
diff --git a/source/blender/render/intern/source/pixelblending.c b/source/blender/render/intern/source/pixelblending.c
index 48ce611fed7..522a41d9af7 100644
--- a/source/blender/render/intern/source/pixelblending.c
+++ b/source/blender/render/intern/source/pixelblending.c
@@ -1,10 +1,4 @@
 /*
- * pixelblending.c
- *
- * Functions to blend pixels with or without alpha, in various formats
- * nzc - June 2000
- *
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -31,6 +25,9 @@
 
 /** \file blender/render/intern/source/pixelblending.c
  *  \ingroup render
+ *
+ * Functions to blend pixels with or without alpha, in various formats
+ * nzc - June 2000
  */
 
 
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index 162fc160915..a49097f5b7d 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -1,5 +1,4 @@
-/*  
- *
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c
index 1dcac84271a..cbcc63148e9 100644
--- a/source/blender/render/intern/source/sss.c
+++ b/source/blender/render/intern/source/sss.c
@@ -1,5 +1,4 @@
 /*
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -30,7 +29,6 @@
  *  \ingroup render
  */
 
-
 /* Possible Improvements:
  * - add fresnel terms
  * - adapt Rd table to scale, now with small scale there are a lot of misses?