svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00
parent 4c66e696fb 61596d5bb3
commit 48006292d8
717 changed files with 4737 additions and 3105 deletions
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -29,8 +29,8 @@
 *  \ingroup gpu
 */

-#ifndef GPU_GAME_H
-#define GPU_GAME_H
+#ifndef __GPU_DRAW_H__
+#define __GPU_DRAW_H__

 #ifdef __cplusplus
 extern "C" {
--- a/source/blender/gpu/GPU_extensions.h
+++ b/source/blender/gpu/GPU_extensions.h
@@ -29,8 +29,8 @@
 *  \ingroup gpu
 */

-#ifndef GPU_EXTENSIONS_H
-#define GPU_EXTENSIONS_H
+#ifndef __GPU_EXTENSIONS_H__
+#define __GPU_EXTENSIONS_H__

 #ifdef __cplusplus
 extern "C" {
--- a/source/blender/gpu/GPU_material.h
+++ b/source/blender/gpu/GPU_material.h
@@ -29,8 +29,8 @@
 *  \ingroup gpu
 */

-#ifndef __GPU_MATERIAL__
-#define __GPU_MATERIAL__
+#ifndef __GPU_MATERIAL_H__
+#define __GPU_MATERIAL_H__

 #include "DNA_listBase.h"

@@ -238,5 +238,5 @@ int GPU_lamp_shadow_layer(GPULamp *lamp);
 }
 #endif

-#endif /*__GPU_MATERIAL__*/
+#endif /*__GPU_MATERIAL_H__*/